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

Fixing edit work see BT#6916

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 621a9ad1a6
commit cc26d1667d
3 changed files with 66 additions and 99 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. 15
      main/work/edit_work.php
  2. 147
      main/work/work.lib.php
  3. 3
      main/work/work_list.php

15
main/work/edit_work.php
Unescape View File

@ -4,8 +4,13 @@
$language_file = array('exercice', 'work', 'document', 'admin', 'gradebook'); $language_file = array('exercice', 'work', 'document', 'admin', 'gradebook');
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
$lib_path = api_get_path(LIBRARY_PATH);
/* Libraries */
require_once $lib_path.'fileManage.lib.php';
require_once 'work.lib.php'; require_once 'work.lib.php';
// Section (for the tabs) // Section (for the tabs)
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
@ -93,12 +98,7 @@ $display_edit_form = true;
if ($form->validate()) { if ($form->validate()) {
$params = $form->exportValues(); $params = $form->exportValues();
$workId = $params['work_id']; $workId = $params['work_id'];
$dir_name = replace_dangerous_char($params['dir_name']);
$dir_name = disable_dangerous_file($dir_name);
$edit_check = false; $edit_check = false;
$workData = get_work_data_by_id($workId); $workData = get_work_data_by_id($workId);
if (!empty($workData)) { if (!empty($workData)) {
@ -108,11 +108,8 @@ if ($form->validate()) {
} }
if ($edit_check) { if ($edit_check) {
updatePublicationAssignment($workId, $params, $courseInfo, $group_id); updatePublicationAssignment($workId, $params, $courseInfo, $group_id);
updateDirName($workData, $dir_name, $params['dir_name'], $courseInfo); updateDirName($workData, $params['new_dir']);
$dir = $dir_name;
Display::display_confirmation_message(get_lang('FolderEdited')); Display::display_confirmation_message(get_lang('FolderEdited'));
} else { } else {

147
main/work/work.lib.php
Unescape View File

@ -137,20 +137,20 @@ function two_digits($number)
*/ */
function convert_date_to_array($date, $group) function convert_date_to_array($date, $group)
{ {
$parts = explode(' ', $date); $parts = explode(' ', $date);
$date_parts = explode('-', $parts[0]); $date_parts = explode('-', $parts[0]);
$date_parts_tmp = array(); $date_parts_tmp = array();
foreach ($date_parts as $item) { foreach ($date_parts as $item) {
$date_parts_tmp[] = intval($item); $date_parts_tmp[] = intval($item);
} }
$time_parts = explode(':', $parts[1]); $time_parts = explode(':', $parts[1]);
$time_parts_tmp = array(); $time_parts_tmp = array();
foreach ($time_parts as $item) { foreach ($time_parts as $item) {
$time_parts_tmp[] = intval($item); $time_parts_tmp[] = intval($item);
} }
list($data[$group]['year'], $data[$group]['month'], $data[$group]['day']) = $date_parts_tmp; list($data[$group]['year'], $data[$group]['month'], $data[$group]['day']) = $date_parts_tmp;
list($data[$group]['hour'], $data[$group]['minute']) = $time_parts_tmp; list($data[$group]['hour'], $data[$group]['minute']) = $time_parts_tmp;
return $data; return $data;
} }
@ -402,7 +402,7 @@ function getUniqueStudentAttempts($workId, $groupId, $course_id, $sessionId, $us
/** /**
* Display the list of student publications, taking into account the user status * Display the list of student publications, taking into account the user status
* * @deprecated
* @param $id * @param $id
* @param $my_folder_data * @param $my_folder_data
* @param $work_parents * @param $work_parents
@ -686,9 +686,9 @@ function showStudentWorkGrid()
{ {
$courseInfo = api_get_course_info(); $courseInfo = api_get_course_info();
$columnModel = array( $columnModel = array(
array('name'=>'type', 'index'=>'type', 'width'=>'80', 'align'=>'left'), array('name'=>'type', 'index'=>'type', 'width'=>'30', 'align'=>'left', 'sortable'=>'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'80', 'align'=>'left'), array('name'=>'title', 'index'=>'title', 'width'=>'80', 'align'=>'left'),
array('name'=>'expires_on', 'index'=>'handed_out_date_limit', 'width'=>'500', 'align'=>'left','sortable'=>'false') array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'500', 'align'=>'left', 'sortable'=>'false')
); );
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_work_student&'.api_get_cidreq(); $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_work_student&'.api_get_cidreq();
@ -701,19 +701,26 @@ function showStudentWorkGrid()
if ($courseInfo['show_score'] == 0) { if ($courseInfo['show_score'] == 0) {
$columnModel[] = array( $columnModel[] = array(
'name'=>'others', 'name' => 'others',
'index'=>'others', 'index' => 'others',
'width'=>'80', 'width' => '80',
'align'=>'left' 'align' => 'left',
'sortable' => 'false'
); );
$columns[] = get_lang('Others'); $columns[] = get_lang('Others');
} }
$params = array(
'autowidth' => 'true',
'height' => 'auto'
);
$html = '<script> $html = '<script>
$(function() { $(function() {
'.Display::grid_js('workList', $url, $columns, $columnModel, array(), array(), array(), true).' '.Display::grid_js('workList', $url, $columns, $columnModel, $params, array(), array(), true).'
}); });
</script>'; </script>';
$html .= Display::grid_html('workList'); $html .= Display::grid_html('workList');
return $html; return $html;
} }
@ -752,9 +759,10 @@ function showTeacherWorkGrid()
get_lang('Actions') get_lang('Actions')
); );
$params = array( $params = array(
'multiselect' => true 'multiselect' => true,
'autowidth' => 'true',
'height' => 'auto'
); );
$html = '<script> $html = '<script>
@ -770,52 +778,12 @@ function showTeacherWorkGrid()
{ reloadAfterSubmit:false, url: "'.$deleteUrl.'" }, // del options { reloadAfterSubmit:false, url: "'.$deleteUrl.'" }, // del options
{ width:500 } // search options { width:500 } // search options
); );
}); });
</script>'; </script>';
$html .= Display::grid_html('workList'); $html .= Display::grid_html('workList');
return $html; return $html;
} }
/**
* Returns a list of subdirectories found in the given directory.
*
* The list return starts from the given base directory.
* If you require the subdirs of /var/www/ (or /var/www), you will get 'abc/', 'def/', but not '/var/www/abc/'...
* @param string Base dir
* @param integer 0 if we only want dirs from this level, 1 if we want to recurse into subdirs
* @return strings_array The list of subdirs in 'abc/' form, -1 on error, and 0 if none found
* @todo Add a session check to see if subdirs_list doesn't exist yet (cached copy)
*/
function get_subdirs_list($basedir = '', $recurse = 0)
{
//echo "Looking for subdirs of $basedir";
if (empty($basedir) or !is_dir($basedir)) {
return -1;
}
if (substr($basedir, -1, 1) != '/') {
$basedir = $basedir.'/';
}
$dirs_list = array();
$dh = opendir($basedir);
while ($entry = readdir($dh)) {
$entry = replace_dangerous_char($entry);
$entry = disable_dangerous_file($entry);
if (is_dir($basedir.$entry) && $entry != '..' && $entry != '.') {
$dirs_list[] = $entry;
if ($recurse == 1) {
foreach (get_subdirs_list($basedir.$entry) as $subdir) {
$dirs_list[] = $entry.'/'.$subdir;
}
}
}
}
closedir($dh);
return $dirs_list;
}
/** /**
* Builds the form thats enables the user to * Builds the form thats enables the user to
* select a directory to browse/upload in * select a directory to browse/upload in
@ -1105,44 +1073,47 @@ function updateWorkUrl($id, $new_path, $parent_id)
/** /**
* Update the url of a dir in the student_publication table * Update the url of a dir in the student_publication table
* @param string old path * @param array work original data
* @param string new path * @param string new path
* @return bool
*/ */
function updateDirName($work_data, $new_name, $title, $courseInfo) function updateDirName($work_data, $newPath)
{ {
$course_id = api_get_course_int_id(); $course_id = $work_data['c_id'];
$courseInfo = api_get_course_info_by_id($course_id);
$work_id = intval($work_data['id']); $work_id = intval($work_data['id']);
$oldPath = $work_data['url'];
$path = $work_data['url']; $path = $work_data['url'];
$originalNewPath = Database::escape_string($newPath);
$newPath = Database::escape_string($newPath);
$newPath = replace_dangerous_char($newPath);
$newPath = disable_dangerous_file($newPath);
if ($work_data['title'] == $title) { if ($oldPath == '/'.$newPath) {
return true; return true;
} }
$title = Database::escape_string($title);
if (!empty($new_name)) {
if (!empty($newPath)) {
$base_work_dir = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/work'; $base_work_dir = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/work';
my_rename($base_work_dir.$oldPath, $newPath);
$new_name = Security::remove_XSS($new_name);
$new_name = replace_dangerous_char($new_name);
$new_name = disable_dangerous_file($new_name);
my_rename($base_work_dir.'/'.$path, $new_name);
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION); $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
//update all the files in the other directories according with the next query //update all the files in the other directories according with the next query
$sql = "SELECT id, url FROM $table WHERE c_id = $course_id AND parent_id = $work_id"; $sql = "SELECT id, url FROM $table WHERE c_id = $course_id AND parent_id = $work_id";
$rs = Database::query($sql); $result = Database::query($sql);
$work_len = strlen('work/'.$path); $work_len = strlen('work/'.$path);
while ($work = Database :: fetch_array($rs)) { while ($work = Database :: fetch_array($result)) {
$new_dir = $work['url']; $new_dir = $work['url'];
$name_with_directory = substr($new_dir, $work_len, strlen($new_dir)); $name_with_directory = substr($new_dir, $work_len, strlen($new_dir));
$name = Database::escape_string('work/'.$new_name.'/'.$name_with_directory); $name = Database::escape_string('work/'.$newPath.'/'.$name_with_directory);
$sql = 'UPDATE '.$table.' SET url= "'.$name.'" WHERE c_id = '.$course_id.' AND id= '.$work['id']; $sql = 'UPDATE '.$table.' SET url= "'.$name.'" WHERE c_id = '.$course_id.' AND id = '.$work['id'];
Database::query($sql); Database::query($sql);
} }
$sql = "UPDATE $table SET url= '/".$new_name."' , title = '".$title."' WHERE c_id = $course_id AND id = $work_id"; $sql = "UPDATE $table SET url= '/".$newPath."', title = '".$originalNewPath."'
WHERE c_id = $course_id AND id = $work_id";
Database::query($sql); Database::query($sql);
} }
} }
@ -1824,11 +1795,11 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
} }
} else { } else {
if ($qualification_exists) { if ($qualification_exists) {
$action .= '<a href="'.$url.'edit.php?'.api_get_cidreq().'&item_id='.$item_id.'&id='.$work['parent_id'].'" title="'.get_lang('Modify').'" >'. $action .= '<a href="'.$url.'edit.php?'.api_get_cidreq().'&item_id='.$item_id.'&id='.$work['parent_id'].'" title="'.get_lang('Edit').'" >'.
Display::return_icon('rate_work.png', get_lang('CorrectAndRate'),array(), ICON_SIZE_SMALL).'</a>'; Display::return_icon('rate_work.png', get_lang('CorrectAndRate'),array(), ICON_SIZE_SMALL).'</a>';
} else { } else {
$action .= '<a href="'.$url.'edit.php?'.api_get_cidreq().'&item_id='.$item_id.'&id='.$work['parent_id'].'&gradebook='.Security::remove_XSS($_GET['gradebook']).'" title="'.get_lang('Modify').'">'. $action .= '<a href="'.$url.'edit.php?'.api_get_cidreq().'&item_id='.$item_id.'&id='.$work['parent_id'].'&gradebook='.Security::remove_XSS($_GET['gradebook']).'" title="'.get_lang('Modify').'">'.
Display::return_icon('edit.png', get_lang('Comment'),array(), ICON_SIZE_SMALL).'</a>'; Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
} }
} }
@ -2919,7 +2890,6 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $group_id)
} }
$qualification = isset($params['qualification']) && !empty($params['qualification']) ? 1 : 0; $qualification = isset($params['qualification']) && !empty($params['qualification']) ? 1 : 0;
$expiryDate = (isset($params['enableExpiryDate']) && $params['enableExpiryDate'] == 1) ? api_get_utc_datetime(get_date_from_select('expires', $params)) : '0000-00-00 00:00:00'; $expiryDate = (isset($params['enableExpiryDate']) && $params['enableExpiryDate'] == 1) ? api_get_utc_datetime(get_date_from_select('expires', $params)) : '0000-00-00 00:00:00';
$endDate = ((isset($params['enableEndDate']) && $params['enableEndDate']==1) ? api_get_utc_datetime(get_date_from_select('ends', $params)) : '0000-00-00 00:00:00'); $endDate = ((isset($params['enableEndDate']) && $params['enableEndDate']==1) ? api_get_utc_datetime(get_date_from_select('ends', $params)) : '0000-00-00 00:00:00');
@ -2975,7 +2945,7 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $group_id)
if (isset($params['make_calification']) && $params['make_calification'] == 1) { if (isset($params['make_calification']) && $params['make_calification'] == 1) {
if (empty($linkId)) { if (empty($linkId)) {
add_resource_to_course_gradebook( add_resource_to_course_gradebook(
$_POST['category_id'], $params['category_id'],
$courseInfo['code'], $courseInfo['code'],
LINK_STUDENTPUBLICATION, LINK_STUDENTPUBLICATION,
$workId, $workId,
@ -2990,7 +2960,7 @@ function updatePublicationAssignment($workId, $params, $courseInfo, $group_id)
update_resource_from_course_gradebook($linkId, $courseInfo['code'], $params['weight']); update_resource_from_course_gradebook($linkId, $courseInfo['code'], $params['weight']);
} }
} else { } else {
// Delete everything of the gradebook // Delete everything of the gradebook for this $linkId
remove_resource_from_course_gradebook($linkId); remove_resource_from_course_gradebook($linkId);
} }
} }
@ -3083,7 +3053,7 @@ function getFormWork($form, $defaults = array())
' '.get_lang('AdvancedParameters').'</span></a>' ' '.get_lang('AdvancedParameters').'</span></a>'
); );
if (!empty($defaults) && isset($defaults['qualification'])) { if (!empty($defaults) && (isset($defaults['enableEndDate']) || isset($defaults['enableExpiryDate']))) {
$form->addElement('html', '<div id="options" style="display: block;">'); $form->addElement('html', '<div id="options" style="display: block;">');
} else { } else {
$form->addElement('html', '<div id="options" style="display: none;">'); $form->addElement('html', '<div id="options" style="display: none;">');
@ -3138,7 +3108,6 @@ function getFormWork($form, $defaults = array())
$defaults = array_merge($defaults, $expires_date_array); $defaults = array_merge($defaults, $expires_date_array);
} }
$form->addGroup(create_group_date_select($form), 'expires', get_lang('ExpiresAt')); $form->addGroup(create_group_date_select($form), 'expires', get_lang('ExpiresAt'));
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');

3
main/work/work_list.php
Unescape View File

@ -66,8 +66,9 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId)) {
echo Display::return_icon('upload_file.png', get_lang('UploadADocument'), '', ICON_SIZE_MEDIUM).'</a>'; echo Display::return_icon('upload_file.png', get_lang('UploadADocument'), '', ICON_SIZE_MEDIUM).'</a>';
if (!empty($documentsAddedInWork)) { if (!empty($documentsAddedInWork)) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload_from_template.php?'.api_get_cidreq().'&id='.$workId.'&origin='.$origin.'&gradebook='.$gradebook.'">'; echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/upload_from_template.php?'.api_get_cidreq().'&id='.$workId.'&origin='.$origin.'&gradebook='.$gradebook.'">';
echo Display::return_icon('import_html.png', get_lang('UploadFromTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
} }
echo Display::return_icon('import_html.png', get_lang('UploadFromTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
} }
echo '</div>'; echo '</div>';

Write Preview
Loading…
Cancel
Save