chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature #272 - "Documents" tool: Revision again, some cleaning and unrelated changes have been done.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent c2ce98995f
commit 1aef40239f
4 changed files with 175 additions and 179 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 223
      main/document/document.php
  2. 4
      main/document/downloadfolder.inc.php
  3. 60
      main/document/upload.php
  4. 3
      main/gradebook/index.php

223
main/document/document.php
Unescape View File

@ -31,7 +31,7 @@
/* INIT SECTION */ /* INIT SECTION */
// Name of the language file that needs to be included // Language files that need to be included
$language_file = array('document', 'slideshow', 'gradebook'); $language_file = array('document', 'slideshow', 'gradebook');
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
@ -41,9 +41,9 @@ require_once 'document.inc.php';
$lib_path = api_get_path(LIBRARY_PATH); $lib_path = api_get_path(LIBRARY_PATH);
require_once $lib_path.'usermanager.lib.php'; require_once $lib_path.'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php'; require_once $lib_path.'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; require_once $lib_path.'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once $lib_path.'sortabletable.class.php';
api_protect_course_script(true); api_protect_course_script(true);
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
@ -58,40 +58,39 @@ $(document).ready( function() {
} }
} ); } );
</script>'; </script>';
//session // Session
if (isset($_GET['id_session'])) { if (isset($_GET['id_session'])) {
$_SESSION['id_session'] = intval($_GET['id_session']); $_SESSION['id_session'] = intval($_GET['id_session']);
} }
//create directory certificates // Create directory certificates
$course_id=api_get_course_id(); $course_id = api_get_course_id();
DocumentManager::create_directory_certificate_in_course($course_id); DocumentManager::create_directory_certificate_in_course($course_id);
//show preview // Show preview
if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && isset($_GET['set_preview']) && $_GET['set_preview']==strval(intval($_GET['set_preview']))) { if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && isset($_GET['set_preview']) && $_GET['set_preview'] == strval(intval($_GET['set_preview']))) {
if (isset($_GET['set_preview'])) { if (isset($_GET['set_preview'])) {
//generate document HTML // Generate document HTML
$course_id=api_get_course_id(); $course_id = api_get_course_id();
$content_html=DocumentManager::replace_user_info_into_html($course_id); $content_html = DocumentManager::replace_user_info_into_html($course_id);
$new_content_html=$content_html; $new_content_html = $content_html;
$path_image=api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/gallery'; $path_image = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/gallery';
$new_content_html=str_replace('../images/gallery',$path_image,$new_content_html); $new_content_html = str_replace('../images/gallery', $path_image, $new_content_html);
$path_image_in_default_course=api_get_path(WEB_CODE_PATH).'default_course_document'; $path_image_in_default_course = api_get_path(WEB_CODE_PATH).'default_course_document';
$new_content_html=str_replace('/main/default_course_document',$path_image_in_default_course,$new_content_html); $new_content_html = str_replace('/main/default_course_document', $path_image_in_default_course, $new_content_html);
$path_image_in_dokeos_main=api_get_path(WEB_IMG_PATH); $new_content_html = str_replace('/main/img/', api_get_path(WEB_IMG_PATH), $new_content_html);
$new_content_html=str_replace('/main/img/',$path_image_in_dokeos_main,$new_content_html); echo '
echo ' <style media="print" type="text/css">
<style media="print" type="text/css"> #imprimir {
#imprimir { visibility:hidden;
visibility:hidden; }
} </style>';
</style>'; echo '<a href="javascript:window.print();" style="float:right; padding:4px;" id="imprimir"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
echo '<a href="javascript:window.print();" style="float:right; padding:4px;" id="imprimir"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>'; print_r($new_content_html);
print_r($new_content_html); exit;
exit;
} }
} }
@ -133,7 +132,7 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath'] != '') {
} }
$curdirpathurl = urlencode($curdirpath); $curdirpathurl = urlencode($curdirpath);
//I'm in the certification module? // I'm in the certification module?
$is_certificate_mode = DocumentManager::is_certificate_mode($curdirpath); $is_certificate_mode = DocumentManager::is_certificate_mode($curdirpath);
$course_dir = $_course['path'].'/document'; $course_dir = $_course['path'].'/document';
@ -146,12 +145,12 @@ $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$group_member_with_upload_rights = false; $group_member_with_upload_rights = false;
// If the group id is set, we show them group documents // If the group id is set, we show them group documents
if (isset($_SESSION['_gid']) && $_SESSION['_gid']!='') { if (isset($_SESSION['_gid']) && $_SESSION['_gid'] != '') {
// Needed for group related stuff // Needed for group related stuff
require_once($lib_path. 'groupmanager.lib.php'); require_once $lib_path.'groupmanager.lib.php';
// Get group info // Get group info
$group_properties = GroupManager::get_group_properties($_SESSION['_gid']); $group_properties = GroupManager::get_group_properties($_SESSION['_gid']);
$noPHP_SELF=true; $noPHP_SELF = true;
// Let's assume the user cannot upload files for the group // Let's assume the user cannot upload files for the group
$group_member_with_upload_rights = false; $group_member_with_upload_rights = false;
@ -170,13 +169,13 @@ if (isset($_SESSION['_gid']) && $_SESSION['_gid']!='') {
} elseif ($group_properties['doc_state'] == 1) { // Documents are public } elseif ($group_properties['doc_state'] == 1) { // Documents are public
$to_group_id = $_SESSION['_gid']; $to_group_id = $_SESSION['_gid'];
$req_gid = '&amp;gidReq='.$_SESSION['_gid']; $req_gid = '&amp;gidReq='.$_SESSION['_gid'];
$interbreadcrumb[] = array ('url' => '../group/group.php', 'name' => get_lang('Groups')); $interbreadcrumb[] = array('url' => '../group/group.php', 'name' => get_lang('Groups'));
$interbreadcrumb[] = array ('url' => '../group/group_space.php?gidReq='.$_SESSION['_gid'], 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')'); $interbreadcrumb[] = array('url' => '../group/group_space.php?gidReq='.$_SESSION['_gid'], 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
//allowed to upload? //allowed to upload?
if ($is_allowed_to_edit || GroupManager::is_subscribed($_user['user_id'], $_SESSION['_gid'])) { // Only courseadmin or group members can upload if ($is_allowed_to_edit || GroupManager::is_subscribed($_user['user_id'], $_SESSION['_gid'])) { // Only courseadmin or group members can upload
$group_member_with_upload_rights = true; $group_member_with_upload_rights = true;
} }
} else { //documents not active for this group } else { // Documents not active for this group
$to_group_id = 0; $to_group_id = 0;
$req_gid = ''; $req_gid = '';
} }
@ -212,7 +211,7 @@ if ($to_group_id != 0 && $curdirpath == '/') {
} }
// Check visibility of the current dir path. Don't show anything if not allowed // Check visibility of the current dir path. Don't show anything if not allowed
if (!(DocumentManager::is_visible($curdirpath, $_course)||$is_allowed_to_edit)) { if (!(DocumentManager::is_visible($curdirpath, $_course) || $is_allowed_to_edit)) {
api_not_allowed(); api_not_allowed();
} }
@ -247,7 +246,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'download') {
$error404 .= '<p>The requested URL was not found on this server.</p>'; $error404 .= '<p>The requested URL was not found on this server.</p>';
$error404 .= '<hr>'; $error404 .= '<hr>';
$error404 .= '</body></html>'; $error404 .= '</body></html>';
echo($error404); echo $error404;
exit; exit;
} }
@ -277,9 +276,9 @@ $image_files_only = '';
/* Header */ /* Header */
if ($is_certificate_mode) { if ($is_certificate_mode) {
$interbreadcrumb[]= array ( 'url' => '../gradebook/index.php', 'name' => get_lang('Gradebook')); $interbreadcrumb[]= array('url' => '../gradebook/index.php', 'name' => get_lang('Gradebook'));
} else { } else {
$interbreadcrumb[]= array ('url'=>'', 'name'=> get_lang('Document')); $interbreadcrumb[]= array('url' => '', 'name' => get_lang('Document'));
} }
// Interbreadcrumb for the current directory root path // Interbreadcrumb for the current directory root path
@ -298,7 +297,7 @@ if (!$is_certificate_mode) {
$dir_acum = ''; $dir_acum = '';
for ($i = 0; $i < $array_len; $i++) { for ($i = 0; $i < $array_len; $i++) {
if ($dir_array[$i] =='shared_folder') { if ($dir_array[$i] == 'shared_folder') {
$dir_array[$i] = get_lang('SharedFolder'); $dir_array[$i] = get_lang('SharedFolder');
} elseif (strpos($dir_array[$i], 'sf_user_') !== false) { } elseif (strpos($dir_array[$i], 'sf_user_') !== false) {
$userinfo = Database::get_user_info_from_id(substr($dir_array[$i], 8)); $userinfo = Database::get_user_info_from_id(substr($dir_array[$i], 8));
@ -307,12 +306,12 @@ for ($i = 0; $i < $array_len; $i++) {
$url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i]; $url_dir = 'document.php?&curdirpath='.$dir_acum.$dir_array[$i];
if ($is_certificate_mode) { if ($is_certificate_mode) {
$interbreadcrumb[]= array ('url'=>$url_dir.'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name'=> $dir_array[$i]); $interbreadcrumb[] = array('url' => $url_dir.'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => $dir_array[$i]);
} else { } else {
$interbreadcrumb[]= array ('url'=>$url_dir, 'name'=> $dir_array[$i]); $interbreadcrumb[] = array('url' => $url_dir, 'name' => $dir_array[$i]);
} }
$dir_acum.=$dir_array[$i].'/'; $dir_acum .= $dir_array[$i].'/';
} }
Display::display_header('','Doc'); Display::display_header('','Doc');
@ -360,9 +359,9 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights) { // TEACHER ONLY
} }
} }
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; require_once $lib_path.'fileManage.lib.php';
// This is needed for the update_db_info function // This is needed for the update_db_info function
//$dbTable = $_course['dbNameGlu']."document"; //$dbTable = $_course['dbNameGlu'].'document';
$dbTable = Database::get_course_table(TABLE_DOCUMENT); $dbTable = Database::get_course_table(TABLE_DOCUMENT);
// Security fix: make sure they can't move files that are not in the document table // Security fix: make sure they can't move files that are not in the document table
@ -392,12 +391,11 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights) { // TEACHER ONLY
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
if(DocumentManager::delete_document($_course,$_GET['delete'],$base_work_dir)) if (DocumentManager::delete_document($_course, $_GET['delete'], $base_work_dir)) {
{ if ( isset($_GET['delete_certificate_id']) && $_GET['delete_certificate_id'] == strval(intval($_GET['delete_certificate_id']))) {
if ( isset($_GET['delete_certificate_id']) && $_GET['delete_certificate_id']==strval(intval($_GET['delete_certificate_id'])) ) { $course_id = api_get_course_id();
$course_id=api_get_course_id(); $default_certificate_id = $_GET['delete_certificate_id'];
$default_certificate_id=$_GET['delete_certificate_id']; DocumentManager::remove_attach_certificate($course_id, $default_certificate_id);
DocumentManager::remove_attach_certificate ($course_id,$default_certificate_id);
} }
Display::display_confirmation_message(get_lang('DocDeleted')); Display::display_confirmation_message(get_lang('DocDeleted'));
} else { } else {
@ -588,12 +586,12 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights) { // TEACHER ONLY
} }
} // END is allowed to edit } // END is allowed to edit
//attach certificate in the gradebook // Attach certificate in the gradebook
if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && isset($_GET['set_certificate']) && $_GET['set_certificate']==strval(intval($_GET['set_certificate']))) { if (isset($_GET['curdirpath']) && $_GET['curdirpath'] == '/certificates' && isset($_GET['set_certificate']) && $_GET['set_certificate'] == strval(intval($_GET['set_certificate']))) {
if (isset($_GET['cidReq'])) { if (isset($_GET['cidReq'])) {
$course_id=Security::remove_XSS($_GET['cidReq']);//course id $course_id = Security::remove_XSS($_GET['cidReq']); // course id
$document_id=Security::remove_XSS($_GET['set_certificate']);//document id $document_id = Security::remove_XSS($_GET['set_certificate']); // document id
DocumentManager::attach_gradebook_certificate ($course_id,$document_id) ; DocumentManager::attach_gradebook_certificate ($course_id,$document_id);
Display::display_normal_message(get_lang('IsDefaultCertificate')); Display::display_normal_message(get_lang('IsDefaultCertificate'));
} }
} }
@ -609,22 +607,21 @@ if ($folders === false) {
echo '<div class="actions">'; echo '<div class="actions">';
/* GO TO PARENT DIRECTORY */ /* GO TO PARENT DIRECTORY */
if ($curdirpath!= '/' && $curdirpath!=$group_properties['directory']&& !$is_certificate_mode) {
?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)).$req_gid ?>">
<img src="../img/folder_up.gif" border="0" title="<?php echo get_lang('Up'); ?>" alt="" />
<?php echo get_lang('Up'); ?></a>&nbsp;
<?php
}
if ($is_certificate_mode & $curdirpath!= '/certificates') { if ($curdirpath!= '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) {
?> ?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)).$req_gid ?>"> <a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath) == '\\') ? '/' : dirname($curdirpath)).$req_gid; ?>">
<img src="../img/folder_up.gif" border="0" title="<?php echo get_lang('Up'); ?>" alt="" /> <?php Display::display_icon('folder_up.gif', get_lang('Up')); echo get_lang('Up'); ?></a>&nbsp;
<?php echo get_lang('Up'); ?></a>&nbsp; <?php
<?php }
}
if ($is_certificate_mode && $curdirpath != '/certificates') {
?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath) == '\\') ? '/' : dirname($curdirpath)).$req_gid; ?>">
<?php Display::display_icon('folder_up.gif', get_lang('Up')); echo get_lang('Up'); ?></a>&nbsp;
<?php
}
if (isset($docs_and_folders) && is_array($docs_and_folders)) { if (isset($docs_and_folders) && is_array($docs_and_folders)) {
//echo('<pre>'); //echo('<pre>');
@ -649,8 +646,8 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$document_name = $id['title']; $document_name = $id['title'];
} else { } else {
$document_name = basename($id['path']); $document_name = basename($id['path']);
//Juan Carlos Raña: Get firstname and lastname when folder is in shared_folder. // Juan Carlos Raña: Get firstname and lastname when folder is in shared_folder.
//TODO: Check if is also necessary (above else) // TODO: Check if is also necessary (above else)
if (strstr($document_name, 'sf_user_')) { if (strstr($document_name, 'sf_user_')) {
$userinfo = Database::get_user_info_from_id(substr($document_name, 8)); $userinfo = Database::get_user_info_from_id(substr($document_name, 8));
$document_name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']); $document_name = api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
@ -719,46 +716,52 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
$column_show = array(); $column_show = array();
if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath)) { if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath)) {
// @TODO:check enable more options for shared folders // @TODO:check enable more options for shared folders
/* CREATE NEW DOCUMENT OR NEW DIRECTORY / GO TO UPLOAD / DOWNLOAD ZIPPED FOLDER */ /* CREATE NEW DOCUMENT OR NEW DIRECTORY / GO TO UPLOAD / DOWNLOAD ZIPPED FOLDER */
// Create new document
if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'], $curdirpath)) {
?> ?>
<!-- create new document or directory --> <a href="create_document.php?<?php echo api_get_cidreq(); ?>&dir=<?php echo $curdirpathurl.$req_gid; ?>">
<?php if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'],$curdirpath)) <?php Display::display_icon('filenew.gif', get_lang('CreateDoc')); echo get_lang('CreateDoc'); ?></a>&nbsp;
{?> <?php
<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/filenew.gif" border="0" alt="" title="<?php echo get_lang('CreateDoc'); ?>" /></a>
<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang("CreateDoc"); ?></a>&nbsp;&nbsp;
<?php }?>
<!--create new certificate -->
<?php if ($is_certificate_mode) { ?>
<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat=' . Security::remove_XSS($_GET['selectcat']); ?>"><img src="../img/filenew.gif" border="0" alt="" title="<?php echo get_lang('CreateCertificate'); ?>" /></a>
<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat=' . Security::remove_XSS($_GET['selectcat']); ?>"><?php echo get_lang("CreateCertificate"); ?></a>&nbsp;&nbsp;
<?php }?>
<!-- file upload link -->
<?php
$upload_name = get_lang('UplUploadDocument');
if ($is_certificate_mode) {
$upload_name = get_lang('UploadCertificate');
}?>
<a href="upload.php?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/submit_file.gif" border="0" title="<?php echo get_lang('UplUploadDocument'); ?>" alt="" /></a>
<a href="upload.php?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang('UplUploadDocument'); ?></a>&nbsp;
<!-- create directory -->
<?php if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'],$curdirpath))
{?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" title="<?php echo get_lang('CreateDir'); ?>" alt ="" /></a>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>&amp;createdir=1"><?php echo get_lang("CreateDir"); ?></a>&nbsp;
<a href="quota.php?<?php echo api_get_cidreq();?>"><?php Display::display_icon('statistics.gif', get_lang("ShowCourseQuotaUse")); ?><?php echo get_lang("ShowCourseQuotaUse"); ?></a>
<?php
}
} }
// Create new certificate
if ($is_certificate_mode) {
?>
<a href="create_document.php?<?php echo api_get_cidreq(); ?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat='.Security::remove_XSS($_GET['selectcat']); ?>">
<?php Display::display_icon('filenew.gif', get_lang('CreateCertificate')); echo get_lang('CreateCertificate'); ?></a>&nbsp;
<?php
}
// File upload link
$upload_name = $is_certificate_mode ? get_lang('UploadCertificate') : get_lang('UplUploadDocument');
?>
<a href="upload.php?<?php echo api_get_cidreq(); ?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>">
<?php Display::display_icon('submit_file.gif', $upload_name); echo $upload_name; ?></a>&nbsp;
<?php
// Create directory
if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'], $curdirpath)) {
?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq(); ?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>&amp;createdir=1">
<?php Display::display_icon('folder_new.gif', get_lang('CreateDir')); echo get_lang('CreateDir'); ?></a>&nbsp;
<a href="quota.php?<?php echo api_get_cidreq(); ?>">
<?php Display::display_icon('statistics.gif', get_lang('ShowCourseQuotaUse')); echo get_lang('ShowCourseQuotaUse'); ?></a>&nbsp;
<?php
}
}
if (!is_null($docs_and_folders)) { if (!is_null($docs_and_folders)) {
// Download zipped folder
global $total_size; global $total_size;
if (!$is_certificate_mode && $total_size!=0 && (api_get_setting('students_download_folders') == 'true' || api_is_allowed_to_edit() || api_is_platform_admin())){ ?> if (!$is_certificate_mode && $total_size != 0 && (api_get_setting('students_download_folders') == 'true' || api_is_allowed_to_edit() || api_is_platform_admin())) {
<!-- download zipped folder --> ?>
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder"><img src="../img/zip_save.gif" border="0" title="<?php echo get_lang("Save"); ?> (ZIP)" alt="" /></a> <a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq(); ?>&action=downloadfolder&path=<?php echo $curdirpathurl; ?>">
<a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&action=downloadfolder"><?php echo get_lang("Save"); ?> (ZIP)</a>&nbsp; <?php Display::display_icon('zip_save.gif', get_lang('Save').' (ZIP)'); echo get_lang('Save').' (ZIP)'; ?></a>&nbsp;
<?php <?php
} }
} }
@ -766,11 +769,13 @@ if (!is_null($docs_and_folders)) {
// Slideshow by Patrick Cool, May 2004 // Slideshow by Patrick Cool, May 2004
require 'document_slideshow.inc.php'; require 'document_slideshow.inc.php';
if ($image_present) { if ($image_present) {
echo "<a href=\"slideshow.php?".api_get_cidreq()."&curdirpath=".$curdirpathurl."\"><img src=\"../img/images_gallery.gif\" border=\"0\" title=\"".get_lang('ViewSlideshow')."\"/>&nbsp;". get_lang('ViewSlideshow') . "</a>"; echo '<a href="slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl.'"><img src="../img/images_gallery.gif" border="0" title="'.get_lang('ViewSlideshow').'"/>'.get_lang('ViewSlideshow').'</a>';
} }
echo '</div>'; echo '</div>';
if (!$is_certificate_mode)
if (!$is_certificate_mode) {
echo build_directory_selector($folders, $curdirpath, (isset($group_properties['directory']) ? $group_properties['directory'] : array()), true); echo build_directory_selector($folders, $curdirpath, (isset($group_properties['directory']) ? $group_properties['directory'] : array()), true);
}
if (($is_allowed_to_edit || $group_member_with_upload_rights) && count($docs_and_folders) > 1) { if (($is_allowed_to_edit || $group_member_with_upload_rights) && count($docs_and_folders) > 1) {
$column_show[] = 1; $column_show[] = 1;

4
main/document/downloadfolder.inc.php
Unescape View File

@ -29,7 +29,7 @@ include api_get_path(LIBRARY_PATH).'pclzip/pclzip.lib.php';
$remove_dir = ($path != '/') ? substr($path, 0, strlen($path) - strlen(basename($path))) : '/'; $remove_dir = ($path != '/') ? substr($path, 0, strlen($path) - strlen(basename($path))) : '/';
// Place to temporarily stash the zipfiles // Place to temporarily stash the zipfiles
$temp_zip_dir = $sys_course_path.$_course['path']."/temp"; $temp_zip_dir = $sys_course_path.$_course['path'].'/temp';
// Create the temp dir if it doesn't exist or do a cleanup befor creating the zipfile // Create the temp dir if it doesn't exist or do a cleanup befor creating the zipfile
if (!is_dir($temp_zip_dir)) { if (!is_dir($temp_zip_dir)) {
@ -135,7 +135,7 @@ event_download(($path == '/') ? 'documents.zip (folder)' : basename($path).'.zip
// Start download of created file // Start download of created file
//send_file_to_client($temp_zip_file, basename(empty($_GET['id']) ? 'documents' : $_GET['id']).'.zip'); //send_file_to_client($temp_zip_file, basename(empty($_GET['id']) ? 'documents' : $_GET['id']).'.zip');
$name = ($path=='/') ? 'documents.zip' : basename($path).'.zip'; $name = ($path == '/') ? 'documents.zip' : basename($path).'.zip';
DocumentManager::file_send_for_download($temp_zip_file, true, $name); DocumentManager::file_send_for_download($temp_zip_file, true, $name);
@unlink($temp_zip_file); @unlink($temp_zip_file);

60
main/document/upload.php
Unescape View File

@ -30,7 +30,7 @@
* @todo eliminate code duplication between * @todo eliminate code duplication between
* document/document.php, scormdocument.php * document/document.php, scormdocument.php
* *
* @package dokeos.document * @package chamilo.document
*/ */
// Name of the language file that needs to be included // Name of the language file that needs to be included
@ -191,7 +191,7 @@ if (isset($_SESSION['_gid']) && $_SESSION['_gid'] != '') { // If the group id is
$group_properties = GroupManager::get_group_properties($_SESSION['_gid']); $group_properties = GroupManager::get_group_properties($_SESSION['_gid']);
$noPHP_SELF = true; $noPHP_SELF = true;
if ($is_allowed_to_edit || GroupManager::is_user_in_group($_user['user_id'],$_SESSION['_gid'])) { // Only courseadmin or group members allowed if ($is_allowed_to_edit || GroupManager::is_user_in_group($_user['user_id'], $_SESSION['_gid'])) { // Only courseadmin or group members allowed
$to_group_id = $_SESSION['_gid']; $to_group_id = $_SESSION['_gid'];
$req_gid = '&amp;gidReq='.$_SESSION['_gid']; $req_gid = '&amp;gidReq='.$_SESSION['_gid'];
$interbreadcrumb[] = array('url' => '../group/group_space.php?gidReq='.$_SESSION['_gid'], 'name' => get_lang('GroupSpace')); $interbreadcrumb[] = array('url' => '../group/group_space.php?gidReq='.$_SESSION['_gid'], 'name' => get_lang('GroupSpace'));
@ -205,17 +205,16 @@ if (isset($_SESSION['_gid']) && $_SESSION['_gid'] != '') { // If the group id is
api_not_allowed(true); api_not_allowed(true);
} }
// Group docs can only be uploaded in the group directory // Group docs can only be uploaded in the group directory
if ($to_group_id != 0 && $path == '/') { if ($to_group_id != 0 && $path == '/') {
$path = $group_properties['directory']; $path = $group_properties['directory'];
} }
//I'm in the certification module? // I'm in the certification module?
$is_certificate_mode = false; $is_certificate_mode = false;
$is_certificate_array = explode('/',$path); $is_certificate_array = explode('/', $path);
array_shift($is_certificate_array); array_shift($is_certificate_array);
if ($is_certificate_array[0]=='certificates') { if ($is_certificate_array[0] == 'certificates') {
$is_certificate_mode = true; $is_certificate_mode = true;
} }
@ -236,11 +235,13 @@ if (isset($_REQUEST['certificate'])) {
} else { } else {
$nameTools = get_lang('UplUploadDocument').$add_group_to_title; $nameTools = get_lang('UplUploadDocument').$add_group_to_title;
} }
// Breadcrumbs // Breadcrumbs
if ($is_certificate_mode) if ($is_certificate_mode) {
$interbreadcrumb[]= array ( 'url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook')); $interbreadcrumb[] = array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
else } else {
$interbreadcrumb[] = array('url' =>'./document.php?curdirpath='.urlencode($path).$req_gid, 'name'=> get_lang('Documents')); $interbreadcrumb[] = array('url' => './document.php?curdirpath='.urlencode($path).$req_gid, 'name'=> get_lang('Documents'));
}
// Display the header // Display the header
Display::display_header($nameTools, 'Doc'); Display::display_header($nameTools, 'Doc');
@ -292,7 +293,7 @@ if (isset($_FILES['user_upload'])) {
if (empty($doc_mime)) { if (empty($doc_mime)) {
$allowed_extensions = array('ppt', 'pps', 'xls'); $allowed_extensions = array('ppt', 'pps', 'xls');
$extensions = preg_split("/[\/\\.]/", $doc_path) ; $extensions = preg_split("/[\/\\.]/", $doc_path) ;
$doc_ext = strtolower($extensions[count($extensions)-1]); $doc_ext = strtolower($extensions[count($extensions) - 1]);
if (in_array($doc_ext, $allowed_extensions)) { if (in_array($doc_ext, $allowed_extensions)) {
switch ($doc_ext) { switch ($doc_ext) {
case 'ppt': case 'ppt':
@ -316,7 +317,7 @@ if (isset($_FILES['user_upload'])) {
require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php'; require_once api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php';
$ic_slide = new IndexableChunk(); $ic_slide = new IndexableChunk();
$ic_slide->addValue("title", $file_title); $ic_slide->addValue('title', $file_title);
$ic_slide->addCourseId($courseid); $ic_slide->addCourseId($courseid);
$ic_slide->addToolId(TOOL_DOCUMENT); $ic_slide->addToolId(TOOL_DOCUMENT);
$xapian_data = array( $xapian_data = array(
@ -327,7 +328,7 @@ if (isset($_FILES['user_upload'])) {
); );
$ic_slide->xapian_data = serialize($xapian_data); $ic_slide->xapian_data = serialize($xapian_data);
$di = new DokeosIndexer(); $di = new DokeosIndexer();
$di->connectDb(NULL, NULL, $lang); $di->connectDb(null, null, $lang);
$specific_fields = get_specific_field_list(); $specific_fields = get_specific_field_list();
@ -367,7 +368,7 @@ if (isset($_FILES['user_upload'])) {
} }
// Add terms also to content to make terms findable by probabilistic search // Add terms also to content to make terms findable by probabilistic search
$file_content = $all_specific_terms .' '. $file_content; $file_content = $all_specific_terms .' '. $file_content;
$ic_slide->addValue("content", $file_content); $ic_slide->addValue('content', $file_content);
$di->addChunk($ic_slide); $di->addChunk($ic_slide);
// Index and return a new search engine document id // Index and return a new search engine document id
$did = $di->index(); $did = $di->index();
@ -425,7 +426,7 @@ if (isset($_FILES['user_upload'])) {
} }
// Missing images are submitted // Missing images are submitted
if(isset($_POST['submit_image'])) { if (isset($_POST['submit_image'])) {
$number_of_uploaded_images = count($_FILES['img_file']['name']); $number_of_uploaded_images = count($_FILES['img_file']['name']);
//if images are uploaded //if images are uploaded
if ($number_of_uploaded_images > 0) { if ($number_of_uploaded_images > 0) {
@ -478,28 +479,23 @@ if (isset($_GET['createdir'])) {
echo '<div class="actions">'; echo '<div class="actions">';
// Link back to the documents overview // Link back to the documents overview
if ($is_certificate_mode) if ($is_certificate_mode) {
echo '<a href="document.php?curdirpath='.$path.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview')).get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview').'</a>'; echo '<a href="document.php?curdirpath='.$path.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview')).get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview').'</a>';
else } else {
echo '<a href="document.php?curdirpath='.$path.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview')).get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>'; echo '<a href="document.php?curdirpath='.$path.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview')).get_lang('BackTo').' '.get_lang('DocumentsOverview').'</a>';
}
// link to create a folder // Link to create a folder
if(!isset($_GET['createdir']) && !is_my_shared_folder($_user['user_id'], $path) && !$is_certificate_mode) if (!isset($_GET['createdir']) && !is_my_shared_folder($_user['user_id'], $path) && !$is_certificate_mode) {
{
echo '<a href="'.api_get_self().'?path='.$path.'&amp;createdir=1">'.Display::return_icon('folder_new.gif', get_lang('CreateDir')).get_lang('CreateDir').'</a>'; echo '<a href="'.api_get_self().'?path='.$path.'&amp;createdir=1">'.Display::return_icon('folder_new.gif', get_lang('CreateDir')).get_lang('CreateDir').'</a>';
} }
echo '</div>'; echo '</div>';
//form to select directory // Form to select directory
$folders = DocumentManager::get_all_document_folders($_course,$to_group_id,$is_allowed_to_edit); $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
if (!$is_certificate_mode) if (!$is_certificate_mode) {
echo(build_directory_selector($folders,$path,$group_properties['directory'])); echo(build_directory_selector($folders, $path, $group_properties['directory']));
}
?>
<!-- start upload form -->
<?php
$form = new FormValidator('upload', 'POST', api_get_self(), '', 'enctype="multipart/form-data"'); $form = new FormValidator('upload', 'POST', api_get_self(), '', 'enctype="multipart/form-data"');
$form->addElement('hidden', 'curdirpath', $path); $form->addElement('hidden', 'curdirpath', $path);
@ -552,10 +548,6 @@ $defaults = array('index_document' => 'checked="checked"');
$form->setDefaults($defaults); $form->setDefaults($defaults);
$form->display(); $form->display();
?>
<!-- end upload form -->
<?php
// Footer // Footer
Display::display_footer(); Display::display_footer();

3
main/gradebook/index.php
Unescape View File

@ -646,8 +646,7 @@ if (isset ($_GET['studentoverview'])) {
$path_image_in_default_course=api_get_path(WEB_CODE_PATH).'default_course_document'; $path_image_in_default_course=api_get_path(WEB_CODE_PATH).'default_course_document';
$new_content_html=str_replace('/main/default_course_document',$path_image_in_default_course,$new_content_html); $new_content_html=str_replace('/main/default_course_document',$path_image_in_default_course,$new_content_html);
$path_image_in_dokeos_main=api_get_path(WEB_IMG_PATH); $new_content_html = str_replace('/main/img/', api_get_path(WEB_IMG_PATH), $new_content_html);
$new_content_html=str_replace('/main/img/',$path_image_in_dokeos_main,$new_content_html);
//add print header //add print header
$print= ' $print= '

Write Preview
Loading…
Cancel
Save