|
@@ -34,7 +34,6 @@ $current_course_tool = TOOL_DOCUMENT;
|
|
|
$this_section = SECTION_COURSES;
|
|
|
$to_user_id = null;
|
|
|
$parent_id = null;
|
|
|
-$message = null;
|
|
|
|
|
|
$lib_path = api_get_path(LIBRARY_PATH);
|
|
|
|
|
@@ -50,16 +49,15 @@ if (
|
|
|
) {
|
|
|
unlink($_SESSION['temp_realpath_image']);
|
|
|
}
|
|
|
+$_user = api_get_user_info();
|
|
|
$courseInfo = api_get_course_info();
|
|
|
$course_dir = $courseInfo['directory'] . '/document';
|
|
|
$sys_course_path = api_get_path(SYS_COURSE_PATH);
|
|
|
$base_work_dir = $sys_course_path . $course_dir;
|
|
|
-$http_www = api_get_path(WEB_COURSE_PATH) .
|
|
|
- $courseInfo['directory'] . '/document';
|
|
|
+$http_www = api_get_path(WEB_COURSE_PATH).$courseInfo['directory'] . '/document';
|
|
|
$document_path = $base_work_dir;
|
|
|
$usePpt2lp = api_get_setting('service_ppt2lp', 'active') == 'true';
|
|
|
|
|
|
-$courseInfo = api_get_course_info();
|
|
|
$course_dir = $courseInfo['directory'].'/document';
|
|
|
$sys_course_path = api_get_path(SYS_COURSE_PATH);
|
|
|
$base_work_dir = $sys_course_path.$course_dir;
|
|
@@ -68,7 +66,7 @@ $document_path = $base_work_dir;
|
|
|
|
|
|
$currentUrl = api_get_self().'?'.api_get_cidreq();
|
|
|
|
|
|
-//Removing sessions
|
|
|
+// Removing sessions
|
|
|
unset($_SESSION['draw_dir']);
|
|
|
unset($_SESSION['paint_dir']);
|
|
|
unset($_SESSION['temp_audio_nanogong']);
|
|
@@ -229,18 +227,20 @@ switch ($action) {
|
|
|
|
|
|
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(
|
|
|
+ DocumentManager::remove_attach_certificate(
|
|
|
+ api_get_course_id(),
|
|
|
+ $certificateId
|
|
|
+ );
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('DocDeleted') . ': ' . $documentInfo['title'],
|
|
|
'success'
|
|
|
- );
|
|
|
+ ));
|
|
|
} else {
|
|
|
- $message = Display::return_message(get_lang('DocDeleteError'), 'warning');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('DocDeleteError'), 'warning'));
|
|
|
}
|
|
|
} else {
|
|
|
- $message = Display::return_message(get_lang('FileNotFound'), 'warning');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning'));
|
|
|
}
|
|
|
- Session::write('message', $message);
|
|
|
header("Location: $currentUrl");
|
|
|
exit;
|
|
|
}
|
|
@@ -390,27 +390,28 @@ switch ($action) {
|
|
|
get_lang('Yes').
|
|
|
'</a></p>';
|
|
|
if (!isset($_GET['copy'])) {
|
|
|
- $message = Display::return_message($message, 'warning', false);
|
|
|
+ Display::addFlash(Display::return_message($message, 'warning', false));
|
|
|
}
|
|
|
if (Security::remove_XSS($_GET['copy']) == 'yes') {
|
|
|
if (!copy($file, $copyfile)) {
|
|
|
- $message = Display::return_message(get_lang('CopyFailed'), 'error');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('CopyFailed'), 'error'));
|
|
|
} else {
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('OverwritenFile').' '.$file_link,
|
|
|
'confirmation',
|
|
|
false
|
|
|
- );
|
|
|
+ ));
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
if (!copy($file, $copyfile)) {
|
|
|
- $message = Display::return_message(get_lang('CopyFailed'), 'error');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('CopyFailed'), 'error'));
|
|
|
} else {
|
|
|
- $message = Display::return_message(get_lang('CopyMade').' '.$file_link, 'confirmation', false);
|
|
|
+ Display::addFlash(
|
|
|
+ Display::return_message(get_lang('CopyMade').' '.$file_link, 'confirmation', false)
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
- Session::write('message', $message);
|
|
|
}
|
|
|
break;
|
|
|
case 'convertToPdf':
|
|
@@ -432,10 +433,10 @@ switch ($action) {
|
|
|
'/document' . $document_info['path'];
|
|
|
$fileInfo = pathinfo($file);
|
|
|
if ($fileInfo['extension'] == $formatTarget) {
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('ErrorSameFormat'),
|
|
|
'warning'
|
|
|
- );
|
|
|
+ ));
|
|
|
} elseif (
|
|
|
!(
|
|
|
in_array(
|
|
@@ -455,10 +456,10 @@ switch ($action) {
|
|
|
)
|
|
|
)
|
|
|
) {
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('FormatNotSupported'),
|
|
|
'warning'
|
|
|
- );
|
|
|
+ ));
|
|
|
} else {
|
|
|
$convertedFile = $fileInfo['dirname'] . DIRECTORY_SEPARATOR .
|
|
|
$fileInfo['filename'] . '_from_' . $fileInfo['extension'] .
|
|
@@ -466,10 +467,10 @@ switch ($action) {
|
|
|
$convertedTitle = $document_info['title'];
|
|
|
$obj = new OpenofficePresentation(true);
|
|
|
if (file_exists($convertedFile)) {
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('FileExists'),
|
|
|
'error'
|
|
|
- );
|
|
|
+ ));
|
|
|
} else {
|
|
|
$result = $obj->convertCopyDocument(
|
|
|
$file,
|
|
@@ -477,10 +478,10 @@ switch ($action) {
|
|
|
$convertedTitle
|
|
|
);
|
|
|
if (empty($result)) {
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('CopyFailed'),
|
|
|
'error'
|
|
|
- );
|
|
|
+ ));
|
|
|
} else {
|
|
|
$cidReq = Security::remove_XSS($_GET['cidReq']);
|
|
|
$id_session = api_get_session_id();
|
|
@@ -492,11 +493,11 @@ switch ($action) {
|
|
|
'&id_session=' . $id_session . '&' .
|
|
|
'gidReq=' . $gidReq . '&id=' . current($result)
|
|
|
);
|
|
|
- $message = Display::return_message(
|
|
|
+ Display::addFlash(Display::return_message(
|
|
|
get_lang('CopyMade') . ' ' . $file_link,
|
|
|
'confirmation',
|
|
|
false
|
|
|
- );
|
|
|
+ ));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1059,7 +1060,7 @@ if ($is_allowed_to_edit ||
|
|
|
null,
|
|
|
$sessionId
|
|
|
);
|
|
|
- $message = Display::return_message(get_lang('DirMv'), 'confirmation');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('DirMv'), 'confirmation'));
|
|
|
} elseif (is_file($real_path_target)) {
|
|
|
api_item_property_update(
|
|
|
$courseInfo,
|
|
@@ -1073,7 +1074,7 @@ if ($is_allowed_to_edit ||
|
|
|
null,
|
|
|
$sessionId
|
|
|
);
|
|
|
- $message = Display::return_message(get_lang('DocMv'), 'confirmation');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('DocMv'), 'confirmation'));
|
|
|
}
|
|
|
|
|
|
// Set the current path
|
|
@@ -1086,14 +1087,14 @@ if ($is_allowed_to_edit ||
|
|
|
} elseif (is_file($real_path_target)) {
|
|
|
$message = Display::return_message(get_lang('FileExists'), 'v');
|
|
|
}
|
|
|
+ Display::addFlash($message);
|
|
|
} else {
|
|
|
- $message = Display::return_message(get_lang('Impossible'), 'error');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('Impossible'), 'error'));
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- $message = Display::return_message(get_lang('Impossible'), 'error');
|
|
|
+ Display::addFlash(Display::return_message(get_lang('Impossible'), 'error'));
|
|
|
}
|
|
|
- Session::write('message', $message);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1210,8 +1211,7 @@ if ($is_allowed_to_edit ||
|
|
|
}
|
|
|
}
|
|
|
} // endforeach
|
|
|
-
|
|
|
- Session::write('message', $messages);
|
|
|
+ Display::addFlash($messages);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1284,7 +1284,7 @@ if ($is_allowed_to_edit ||
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- Session::write('message', $message);
|
|
|
+ Display::addFlash($message);
|
|
|
}
|
|
|
|
|
|
// Show them the form for the directory name
|
|
@@ -1372,9 +1372,7 @@ if ($is_allowed_to_edit ||
|
|
|
} elseif (isset($_GET['add_as_template']) && isset($_POST['create_template'])) {
|
|
|
|
|
|
$document_id_for_template = intval($_GET['add_as_template']);
|
|
|
-
|
|
|
$title = Security::remove_XSS($_POST['template_title']);
|
|
|
- //$description = Security::remove_XSS($_POST['template_description']);
|
|
|
$user_id = api_get_user_id();
|
|
|
|
|
|
// Create the template_thumbnails folder in the upload folder (if needed)
|
|
@@ -1425,8 +1423,9 @@ if ($is_allowed_to_edit ||
|
|
|
$user_id,
|
|
|
$new_file_name
|
|
|
);
|
|
|
- $message = Display::return_message(get_lang('DocumentSetAsTemplate'), 'confirmation');
|
|
|
- Session::write('message', $message);
|
|
|
+ Display::addFlash(
|
|
|
+ Display::return_message(get_lang('DocumentSetAsTemplate'), 'confirmation')
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
if (isset($_GET['remove_as_template'])) {
|
|
@@ -1437,8 +1436,10 @@ if ($is_allowed_to_edit ||
|
|
|
$course_code,
|
|
|
$user_id
|
|
|
);
|
|
|
- $message = Display::return_message(get_lang('DocumentUnsetAsTemplate'), 'confirmation');
|
|
|
- Session::write('message', $message);
|
|
|
+
|
|
|
+ Display::addFlash(
|
|
|
+ Display::return_message(get_lang('DocumentUnsetAsTemplate'), 'confirmation')
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1454,7 +1455,9 @@ if (isset($_GET['curdirpath']) &&
|
|
|
$document_id = Security::remove_XSS($_GET['set_certificate']); // document id
|
|
|
DocumentManager::attach_gradebook_certificate($course_id, $document_id);
|
|
|
$message = Display::return_message(get_lang('IsDefaultCertificate'), 'normal');
|
|
|
- Session::write('message', $message);
|
|
|
+ Display::addFlash(
|
|
|
+ $message
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
/* GET ALL DOCUMENT DATA FOR CURDIRPATH */
|
|
@@ -1502,17 +1505,16 @@ if ($groupId != 0) {
|
|
|
if (!isset($folders) || $folders === false) {
|
|
|
$folders = array();
|
|
|
}
|
|
|
-$btngroup= array('class' => 'btn btn-default');
|
|
|
+$btngroup = array('class' => 'btn btn-default');
|
|
|
|
|
|
|
|
|
/* GO TO PARENT DIRECTORY */
|
|
|
+$actionsLeft = '';
|
|
|
|
|
|
if ($curdirpath != '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) {
|
|
|
-
|
|
|
$actionsLeft = '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'">';
|
|
|
$actionsLeft .= Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM);
|
|
|
$actionsLeft .= '</a>';
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if ($is_certificate_mode && $curdirpath != '/certificates') {
|
|
@@ -1530,9 +1532,7 @@ if ($is_allowed_to_edit ||
|
|
|
) {
|
|
|
// TODO:check enable more options for shared folders
|
|
|
/* CREATE NEW DOCUMENT OR NEW DIRECTORY / GO TO UPLOAD / DOWNLOAD ZIPPED FOLDER */
|
|
|
-
|
|
|
// Create new document
|
|
|
-
|
|
|
if (!$is_certificate_mode) {
|
|
|
$actionsLeft .= Display::url(
|
|
|
Display::return_icon('new_document.png', get_lang('CreateDoc'), '', ICON_SIZE_MEDIUM),
|
|
@@ -1647,11 +1647,10 @@ if (api_is_allowed_to_edit(null, true)) {
|
|
|
Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM),
|
|
|
api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq()
|
|
|
);
|
|
|
-}
|
|
|
-
|
|
|
+}
|
|
|
+$actionsRight = '';
|
|
|
if (!$is_certificate_mode) {
|
|
|
/* BUILD SEARCH FORM */
|
|
|
-
|
|
|
$form = new FormValidator(
|
|
|
'search_document',
|
|
|
'get',
|
|
@@ -1741,7 +1740,7 @@ if (isset($documentAndFolders) && is_array($documentAndFolders)) {
|
|
|
$count++;
|
|
|
}
|
|
|
|
|
|
- // Validacion when belongs to a session
|
|
|
+ // Validation when belongs to a session
|
|
|
$session_img = api_get_session_image($document_data['session_id'], $_user['status']);
|
|
|
|
|
|
// Document title with link
|
|
@@ -1843,8 +1842,6 @@ if (!is_null($documentAndFolders)) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
if (!empty($moveTo)) {
|
|
|
$document_id = DocumentManager::get_document_id($courseInfo, $moveTo);
|
|
|
}
|
|
@@ -1966,7 +1963,10 @@ if (!empty($groupId)) {
|
|
|
} else {
|
|
|
Display::display_introduction_section(TOOL_DOCUMENT);
|
|
|
}
|
|
|
-$toolbar = Display::toolbarAction('toolbar-document',array(0 => $actionsLeft, 1 => $actionsRight));
|
|
|
+$toolbar = Display::toolbarAction(
|
|
|
+ 'toolbar-document',
|
|
|
+ array(0 => $actionsLeft, 1 => $actionsRight)
|
|
|
+);
|
|
|
|
|
|
echo $toolbar;
|
|
|
echo $templateForm;
|