';
+ $modify_icons .= '
+ ';
if ($is_preview) {
$modify_icons .= ' ' .
Display::return_icon('preview_view.png', $preview, '', ICON_SIZE_SMALL) . '';
@@ -638,7 +643,8 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0,
$modify_icons .= ' ' .
Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'), '', ICON_SIZE_SMALL) . '';
}
- $modify_icons .= ' ' . Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '';
+ $modify_icons .= ' ' .
+ Display::return_icon('pdf.png', get_lang('Export2PDF'), array(), ICON_SIZE_SMALL) . '';
}
return $modify_icons;
}
@@ -771,7 +777,6 @@ function display_user_link_document($user_id, $name) {
*/
function create_dir_form($current_dir_id) {
global $document_id;
-
$form = new FormValidator('create_dir_form', 'post', api_get_self().'?'.api_get_cidreq(), '', null, false);
$form->addElement('hidden', 'create_dir', 1);
$form->addElement('hidden', 'dir_id', intval($document_id));
diff --git a/main/document/document.php b/main/document/document.php
index 48f5e1e96f..2c2064039a 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -28,6 +28,7 @@
/**
* Code
*/
+use \ChamiloSession as Session;
// Language files that need to be included
$language_file = array('document', 'slideshow', 'gradebook', 'create_course');
require_once '../inc/global.inc.php';
@@ -35,6 +36,7 @@ $current_course_tool = TOOL_DOCUMENT;
$this_section = SECTION_COURSES;
$to_user_id = null;
$parent_id = null;
+$message = null;
require_once 'document.inc.php';
$lib_path = api_get_path(LIBRARY_PATH);
@@ -93,7 +95,8 @@ if (empty($courseInfo)) {
api_not_allowed(true);
}
-$dbl_click_id = 0; // Used for avoiding double-click
+// Used for avoiding double-click.
+$dbl_click_id = 0;
$selectcat = isset($_GET['selectcat']) ? Security::remove_XSS($_GET['selectcat']) : null;
$moveTo = isset($_POST['move_to']) ? Security::remove_XSS($_POST['move_to']) : null;
@@ -164,13 +167,77 @@ if (!empty($groupId)) {
$document_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
-$message = '';
+
+$currentUrl = api_get_self().'?'.api_get_cidreq().'&id='.$document_id;
if (Portfolio::controller()->accept()) {
Portfolio::controller()->run();
}
switch ($action) {
+ case 'delete_item':
+ if ($is_allowed_to_edit ||
+ $group_member_with_upload_rights ||
+ is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id) ||
+ is_my_shared_folder(api_get_user_id(), $moveTo, $session_id)
+ ) {
+ if (isset($_GET['deleteid'])) {
+ if (!$is_allowed_to_edit) {
+ if (api_is_coach()) {
+ if (!DocumentManager::is_visible_by_id(
+ $_GET['deleteid'],
+ $courseInfo,
+ $session_id,
+ api_get_user_id())
+ ) {
+ api_not_allowed();
+ }
+ }
+
+ if (DocumentManager::check_readonly(
+ $courseInfo,
+ api_get_user_id(),
+ '',
+ $_GET['deleteid'],
+ true)
+ ) {
+ api_not_allowed();
+ }
+ }
+
+ $documentInfo = DocumentManager::get_document_data_by_id(
+ $_GET['deleteid'],
+ $courseInfo['code'],
+ false,
+ $session_id
+ );
+
+ // Check whether the document is in the database.
+ if (!empty($documentInfo)) {
+ $deleteDocument = DocumentManager::delete_document(
+ $courseInfo,
+ null,
+ $base_work_dir,
+ api_get_session_id(),
+ $_GET['deleteid'],
+ $groupId
+ );
+
+ if ($deleteDocument) {
+ $certificateId = isset($_GET['delete_certificate_id']) ? $_GET['delete_certificate_id'] : null;
+ DocumentManager::remove_attach_certificate(api_get_course_id(), $certificateId);
+ $message = Display::return_message(get_lang('DocDeleted').': '.$documentInfo['path'], 'success');
+ } else {
+ $message = Display::return_message(get_lang('DocDeleteError'), 'warning');
+ }
+ } else {
+ $message = Display::return_message(get_lang('FileNotFound'), 'warning');
+ }
+ Session::write('message', $message);
+ header("Location: $currentUrl");
+ exit;
+ }
+ }
case 'download':
// Get the document data from the ID
$document_data = DocumentManager::get_document_data_by_id(
@@ -230,7 +297,7 @@ switch ($action) {
);
}
- //filter when I am into shared folder, I can donwload only my shared folder
+ //filter when I am into shared folder, I can download only my shared folder
if (is_any_user_shared_folder($document_data['path'], $session_id)) {
if (is_my_shared_folder(api_get_user_id(), $document_data['path'], $session_id)
|| api_is_allowed_to_edit()
@@ -338,6 +405,7 @@ switch ($action) {
$message = Display::return_message(get_lang('CopyMade').' '.$file_link, 'confirmation', false);
}
}
+ Session::write('message', $message);
}
break;
}
@@ -712,7 +780,9 @@ if (!empty($documentAndFolders)) {
$session_id
);
if ($session_id != 0 && !$document_data) {
- // If there is a session defined and asking for the document *from the session* didn't work, try it from the course (out of a session context)
+ /* If there is a session defined and asking for the document
+ * from the session* didn't work, try it from the
+ course (out of a session context) */
$document_data = DocumentManager::get_document_data_by_id(
$file['id'],
api_get_course_id(),
@@ -743,7 +813,7 @@ $(document).ready( function() {
});
';
-Display::display_header('', 'Doc');
+
// Lib for event log, stats & tracking & record of the access
event_access_tool(TOOL_DOCUMENT);
@@ -753,15 +823,7 @@ if ($groupId != 0) { // Add group name after for group documents
$add_group_to_title = ' ('.$group_properties['name'].')';
}
-/* Introduction section (editable by course admins) */
-
-if (!empty($groupId)) {
- Display::display_introduction_section(TOOL_DOCUMENT.$groupId);
-} else {
- Display::display_introduction_section(TOOL_DOCUMENT);
-}
-
-// ACTION MENU
+$moveForm = null;
/* MOVE FILE OR DIRECTORY */
//Only teacher and all users into their group and each user into his/her shared folder
@@ -770,19 +832,18 @@ if ($is_allowed_to_edit ||
is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id) ||
is_my_shared_folder(api_get_user_id(), $moveTo, $session_id)
) {
-
if (isset($_GET['move']) && $_GET['move'] != '') {
$my_get_move = intval($_REQUEST['move']);
if (api_is_coach()) {
if (!DocumentManager::is_visible_by_id($my_get_move, $courseInfo, $session_id, api_get_user_id())) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
if (!$is_allowed_to_edit) {
if (DocumentManager::check_readonly($courseInfo, api_get_user_id(), $my_get_move)) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
// Get the document data from the ID
@@ -812,17 +873,16 @@ if ($is_allowed_to_edit ||
$user_shared_folders[] = $fold;
}
}
- echo '';
- echo build_move_to_selector(
+ $moveForm .= '';
+ $moveForm .= build_move_to_selector(
$user_shared_folders,
$move_path,
$my_get_move,
$group_properties['directory']
);
} else {
-
- echo '';
- echo build_move_to_selector($folders, $move_path, $my_get_move, $group_properties['directory']);
+ $moveForm .= '';
+ $moveForm .= build_move_to_selector($folders, $move_path, $my_get_move, $group_properties['directory']);
}
}
}
@@ -831,15 +891,16 @@ if ($is_allowed_to_edit ||
if (!$is_allowed_to_edit) {
if (DocumentManager::check_readonly($courseInfo, api_get_user_id(), $_POST['move_file'])) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
if (api_is_coach()) {
if (!DocumentManager::is_visible_by_id($_POST['move_file'], $courseInfo, $session_id, api_get_user_id())) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
+
// Get the document data from the ID
$document_to_move = DocumentManager::get_document_data_by_id(
$_POST['move_file'],
@@ -875,7 +936,7 @@ if ($is_allowed_to_edit ||
null,
$session_id
);
- Display::display_confirmation_message(get_lang('DirMv'));
+ $message = Display::return_message(get_lang('DirMv'), 'confirmation');
} elseif (is_file($real_path_target)) {
api_item_property_update(
$courseInfo,
@@ -889,7 +950,7 @@ if ($is_allowed_to_edit ||
null,
$session_id
);
- Display::display_confirmation_message(get_lang('DocMv'));
+ $message = Display::return_message(get_lang('DocMv'), 'confirmation');
}
// Set the current path
@@ -898,17 +959,18 @@ if ($is_allowed_to_edit ||
} else {
if ($fileExist) {
if (is_dir($real_path_target)) {
- Display::display_error_message(get_lang('DirExists'));
+ $message = Display::return_message(get_lang('DirExists'), 'error');
} elseif (is_file($real_path_target)) {
- Display::display_error_message(get_lang('FileExists'));
+ $message = Display::return_message(get_lang('FileExists'), 'v');
}
} else {
- Display::display_error_message(get_lang('Impossible'));
+ $message = Display::return_message(get_lang('Impossible'), 'error');
}
}
} else {
- Display::display_error_message(get_lang('Impossible'));
+ $message = Display::return_message(get_lang('Impossible'), 'error');
}
+ Session::write('message', $message);
}
}
@@ -918,64 +980,10 @@ if ($is_allowed_to_edit ||
$group_member_with_upload_rights ||
is_my_shared_folder(api_get_user_id(), $curdirpath, $session_id)
) {
- if (isset($_GET['deleteid'])) {
- if (!$is_allowed_to_edit) {
- if (api_is_coach()) {
- if (!DocumentManager::is_visible_by_id(
- $_GET['deleteid'],
- $courseInfo,
- $session_id,
- api_get_user_id())
- ) {
- api_not_allowed();
- }
- }
-
- if (DocumentManager::check_readonly(
- $courseInfo,
- api_get_user_id(),
- '',
- $_GET['deleteid'],
- true)
- ) {
- api_not_allowed();
- }
- }
-
- $documentInfo = DocumentManager::get_document_data_by_id(
- $_GET['deleteid'],
- $courseInfo['code'],
- false,
- $session_id
- );
-
- // Check whether the document is in the database.
- if (!empty($documentInfo)) {
- $deleteDocument = DocumentManager::delete_document(
- $courseInfo,
- null,
- $base_work_dir,
- api_get_session_id(),
- $_GET['deleteid'],
- $groupId
- );
-
- if ($deleteDocument) {
- $certificateId = isset($_GET['delete_certificate_id']) ? $_GET['delete_certificate_id'] : null;
- DocumentManager::remove_attach_certificate(api_get_course_id(), $certificateId);
- Display::display_confirmation_message(get_lang('DocDeleted').': '.$documentInfo['path']);
- } else {
- Display::display_warning_message(get_lang('DocDeleteError'));
- }
- } else {
- Display::display_warning_message(get_lang('FileNotFound'));
- }
- }
-
if (isset($_POST['action']) && isset($_POST['ids'])) {
$files = $_POST['ids'];
$readonlyAlreadyChecked = false;
-
+ $messages = null;
foreach ($files as $documentId) {
$items = array('/audio', '/flash', '/images', '/shared_folder', '/video', '/chat_files', '/certificates');
$data = DocumentManager::get_document_data_by_id($documentId, $courseInfo['code']);
@@ -983,10 +991,6 @@ if ($is_allowed_to_edit ||
// exclude system directories (do not allow deletion)
continue;
} else {
-
- //$documentId = DocumentManager::get_document_id($courseInfo, $path, $session_id);
- //$data = DocumentManager::get_document_data_by_id($documentId, $courseInfo['code'], false, $session_id);
-
switch ($_POST['action']) {
case 'set_invisible':
$visibilityCommand = 'invisible';
@@ -1002,9 +1006,9 @@ if ($is_allowed_to_edit ||
null,
$session_id
)) {
- Display::display_confirmation_message(get_lang('VisibilityChanged').': '.$data['path']);
+ $messages .= Display::return_message(get_lang('VisibilityChanged').': '.$data['path'], 'confirmation');
} else {
- Display::display_error_message(get_lang('ViModProb'));
+ $messages .= Display::return_message(get_lang('ViModProb'), 'error');
}
break;
case 'set_visible':
@@ -1021,9 +1025,9 @@ if ($is_allowed_to_edit ||
null,
$session_id
)) {
- Display::display_confirmation_message(get_lang('VisibilityChanged').': '.$data['path']);
+ $messages .= Display::return_message(get_lang('VisibilityChanged').': '.$data['path'], 'confirmation');
} else {
- Display::display_error_message(get_lang('ViModProb'));
+ $messages .= Display::return_message(get_lang('ViModProb'), 'error');
}
break;
case 'delete':
@@ -1042,7 +1046,7 @@ if ($is_allowed_to_edit ||
$session_id
)
) {
- Display::display_error_message(get_lang('CantDeleteReadonlyFiles'));
+ $messages .= Display::return_message(get_lang('CantDeleteReadonlyFiles'), 'error');
break 2;
}
}
@@ -1059,15 +1063,20 @@ if ($is_allowed_to_edit ||
$groupId
);
if (!empty($deleteDocument)) {
- Display::display_confirmation_message(get_lang('DocDeleted').': '.$data['path']);
+ $messages .= Display::return_message(get_lang('DocDeleted').': '.$data['path'], 'confirmation');
}
break;
}
}
- }
+ } // endforeach
+
+ Session::write('message', $messages);
}
}
+$dirForm = null;
+
+
/* CREATE DIRECTORY */
//Only teacher and all users into their group and any user into his/her shared folder
if ($is_allowed_to_edit ||
@@ -1080,7 +1089,7 @@ if ($is_allowed_to_edit ||
$post_dir_name = $_POST['dirname'];
if ($post_dir_name == '../' || $post_dir_name == '.' || $post_dir_name == '..') {
- Display::display_error_message(get_lang('CannotCreateDir'));
+ $message = Display::return_message(get_lang('CannotCreateDir'), 'error');
} else {
if (!empty($_POST['dir_id'])) {
// Get the document data from the ID
@@ -1124,19 +1133,20 @@ if ($is_allowed_to_edit ||
);
if ($created_dir) {
- Display::display_confirmation_message(''.get_lang('DirCr').'', false);
+ $message = Display::return_message(get_lang('DirCr').' '.$created_dir, 'confirmation');
} else {
- Display::display_error_message(get_lang('CannotCreateDir'));
+ $message = Display::return_message(get_lang('CannotCreateDir'), 'error');
}
} else {
- Display::display_error_message(get_lang('CannotCreateDir'));
+ $message = Display::return_message(get_lang('CannotCreateDir'), 'error');
}
}
+ Session::write('message', $message);
}
// Show them the form for the directory name
if (isset($_GET['createdir'])) {
- echo create_dir_form($document_id);
+ $dirForm = create_dir_form($document_id);
}
}
@@ -1158,11 +1168,11 @@ if ($is_allowed_to_edit) {
if (!$is_allowed_to_edit) {
if (api_is_coach()) {
if (!DocumentManager::is_visible_by_id($update_id, $courseInfo, $session_id, api_get_user_id())) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
if (DocumentManager::check_readonly($courseInfo, api_get_user_id(), '', $update_id)) {
- api_not_allowed();
+ api_not_allowed(true);
}
}
@@ -1180,12 +1190,14 @@ if ($is_allowed_to_edit) {
$session_id)
) {
//don't use ViMod because firt is load ViMdod (Gradebook). VisibilityChanged (trad4all)
- Display::display_confirmation_message(get_lang('VisibilityChanged'));
+ $message = Display::return_message(get_lang('VisibilityChanged'), 'confirmation');
} else {
- Display::display_error_message(get_lang('ViModProb'));
+ $message = Display::return_message(get_lang('ViModProb'), 'error');
}
+ Session::write('message', $message);
}
}
+$templateForm = null;
/* TEMPLATE ACTION */
//Only teacher and all users into their group
@@ -1198,20 +1210,18 @@ if ($is_allowed_to_edit ||
$document_id_for_template = intval($_GET['add_as_template']);
// Create the form that asks for the directory name
- $template_text = '';
- // Show the form
- Display::display_normal_message($template_text, false);
+ $templateForm .= '';
} elseif (isset($_GET['add_as_template']) && isset($_POST['create_template'])) {
$document_id_for_template = intval(Database::escape_string($_GET['add_as_template']));
@@ -1227,9 +1237,9 @@ if ($is_allowed_to_edit ||
api_get_permissions_for_new_directories()
);
}
+
// Upload the file
if (!empty($_FILES['template_image']['name'])) {
-
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
$upload_ok = process_uploaded_file($_FILES['template_image']);
@@ -1269,7 +1279,8 @@ if ($is_allowed_to_edit ||
$user_id,
$new_file_name
);
- Display::display_confirmation_message(get_lang('DocumentSetAsTemplate'));
+ $message = Display::return_message(get_lang('DocumentSetAsTemplate'), 'confirmation');
+ Session::write('message', $message);
}
if (isset($_GET['remove_as_template'])) {
@@ -1280,8 +1291,10 @@ if ($is_allowed_to_edit ||
$course_code,
$user_id
);
- Display::display_confirmation_message(get_lang('DocumentUnsetAsTemplate'));
+ $message = Display::return_message(get_lang('DocumentUnsetAsTemplate'), 'confirmation');
+ Session::write('message', $message);
}
+
}
// END ACTION MENU
@@ -1295,7 +1308,8 @@ if (isset($_GET['curdirpath']) &&
$course_id = Security::remove_XSS($_GET['cidReq']); // course id
$document_id = Security::remove_XSS($_GET['set_certificate']); // document id
DocumentManager::attach_gradebook_certificate($course_id, $document_id);
- Display::display_normal_message(get_lang('IsDefaultCertificate'));
+ $message = Display::return_message(get_lang('IsDefaultCertificate'), 'normal');
+ Session::write('message', $message);
}
}
@@ -1345,11 +1359,11 @@ if (!isset($folders) || $folders === false) {
$folders = array();
}
-echo '';
-echo '