@@ -1088,33 +1088,33 @@ function create_unexisting_work_directory($base_work_dir, $desired_dir_name) {
* @return integer -1 on error
*/
function del_dir($id) {
- global $_course;
+ global $_course;
$id = intval($id);
$work_data = get_work_data_by_id($id);
-
+
if (empty($work_data)) {
return false;
- }
-
- $base_work_dir = api_get_path(SYS_COURSE_PATH) .$_course['path'].'/work';
- $work_data_url = $base_work_dir.$work_data['url'];
- $check = Security::check_abs_path($work_data_url.'/', $base_work_dir.'/');
-
-
+ }
+
+ $base_work_dir = api_get_path(SYS_COURSE_PATH) .$_course['path'].'/work';
+ $work_data_url = $base_work_dir.$work_data['url'];
+ $check = Security::check_abs_path($work_data_url.'/', $base_work_dir.'/');
+
+
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$course_id = api_get_course_int_id();
if (!empty($work_data['url'])) {
-
+
//Deleting all contents inside the folder
- //@todo replace to parent_id
- $sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND filetype = 'folder' AND id = $id";
+ //@todo replace to parent_id
+ $sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND filetype = 'folder' AND id = $id";
$res = Database::query($sql);
-
+
$sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND parent_id = $id";
$res = Database::query($sql);
- if ($check) {
+ if ($check) {
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
$new_dir = $work_data_url.'_DELETED_'.$id;
if (api_get_setting('permanently_remove_deleted_files') == 'true'){
@@ -1157,7 +1157,7 @@ function update_work_url($id, $new_path, $parent_id) {
$course_id = api_get_course_int_id();
$id = intval($id);
$parent_id = intval($parent_id);
-
+
$sql = "SELECT * FROM $table WHERE c_id = $course_id AND id = $id";
$res = Database::query($sql);
if (Database::num_rows($res) != 1) {
@@ -1177,18 +1177,18 @@ function update_work_url($id, $new_path, $parent_id) {
* @param string old path
* @param string new path
*/
-function update_dir_name($work_data, $new_name, $title) {
+function update_dir_name($work_data, $new_name, $title) {
$course_id = api_get_course_int_id();
$work_id = intval($work_data['id']);
$path = $work_data['url'];
-
+
if ($work_data['title'] == $title) {
return true;
- }
+ }
$title = Database::escape_string($title);
-
+
if (!empty($new_name)) {
- global $base_work_dir;
+ global $base_work_dir;
$new_name = Security::remove_XSS($new_name);
$new_name = replace_dangerous_char($new_name);
@@ -1204,12 +1204,12 @@ function update_dir_name($work_data, $new_name, $title) {
while ($work = Database :: fetch_array($rs)) {
$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);
- $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);
}
-
+
$sql = "UPDATE $table SET url= '/".$new_name."' , title = '".$title."' WHERE c_id = $course_id AND id = $work_id";
Database::query($sql);
}
@@ -1232,7 +1232,7 @@ function get_parent_directories($id) {
$list_id = array();
if (Database::num_rows($result)) {
while ($row = Database::fetch_array($result)) {
- $list_id[] = $row['id'];
+ $list_id[] = $row['id'];
}
}
return $list_id;
@@ -1279,12 +1279,12 @@ function insert_all_directory_in_course_table($base_work_dir) {
}
$course_id = api_get_course_int_id();
$group_id = api_get_group_id();
-
+
for($i = 0; $i < count($only_dir); $i++) {
global $work_table;
$sql_insert_all= "INSERT INTO " . $work_table . " SET
- c_id = '$course_id',
- url = '" . $only_dir[$i] . "',
+ c_id = '$course_id',
+ url = '" . $only_dir[$i] . "',
title = '',
description = '',
author = '',
@@ -1333,9 +1333,9 @@ function count_dir($path_dir, $recurse) {
* validation when you create a work
* this goes into the $htmlHeadXtra[] array
*/
-function to_javascript_work() {
+function to_javascript_work() {
$origin = isset($_REQUEST['origin']) && !empty($_REQUEST['origin']) ? api_get_tools_lists($_REQUEST['origin']) : '';
-
+
$js = '';
+ ';
return $js;
}
@@ -1476,12 +1476,12 @@ function get_work_id($path) {
$TBL_PROP_TABLE = Database::get_course_table(TABLE_ITEM_PROPERTY);
$course_id = api_get_course_int_id();
if (api_is_allowed_to_edit()) {
- $sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work, $TBL_PROP_TABLE AS props
+ $sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work, $TBL_PROP_TABLE AS props
WHERE props.c_id = $course_id AND work.c_id = $course_id AND props.tool='work' AND work.id=props.ref AND work.url LIKE 'work/".$path."%' AND work.filetype='file' AND props.visibility<>'2'";
} else {
- $sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work,$TBL_PROP_TABLE AS props
+ $sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work,$TBL_PROP_TABLE AS props
WHERE props.c_id = $course_id AND work.c_id = $course_id AND props.tool='work' AND work.id=props.ref AND work.url LIKE 'work/".$path."%' AND work.filetype='file' AND props.visibility<>'2' AND props.lastedit_user_id='".api_get_user_id()."'";
- }
+ }
$result = Database::query($sql);
$num_rows = Database::num_rows($result);
@@ -1493,37 +1493,37 @@ function get_work_id($path) {
}
function get_count_work($work_id) {
- $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+ $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$iprop_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
- $user_table = Database::get_main_table(TABLE_MAIN_USER);
-
- $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
-
+ $user_table = Database::get_main_table(TABLE_MAIN_USER);
+
+ $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
+
$session_id = api_get_session_id();
$condition_session = api_get_session_condition($session_id);
-
+
$course_id = api_get_course_int_id();
$group_id = api_get_group_id();
$course_info = api_get_course_info(api_get_course_id());
$work_id = intval($work_id);
-
+
if (!empty($group_id)) {
- $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
+ $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
} else {
- $extra_conditions = " work.post_group_id = '0' ";
+ $extra_conditions = " work.post_group_id = '0' ";
}
if ($is_allowed_to_edit) {
$extra_conditions .= ' AND work.active IN (0, 1) ';
} else {
- $extra_conditions .= ' AND work.active = 1 AND accepted = 1';
- if (isset($course_info['show_score']) && $course_info['show_score'] == 1) {
+ $extra_conditions .= ' AND work.active = 1 AND accepted = 1';
+ if (isset($course_info['show_score']) && $course_info['show_score'] == 1) {
$extra_conditions .= " AND work.user_id = ".api_get_user_id()." ";
} else {
$extra_conditions .= '';
}
- }
-
+ }
+
$extra_conditions .= " AND parent_id = ".$work_id." ";
$sql = "SELECT count(*) as count ".
@@ -1534,110 +1534,116 @@ function get_count_work($work_id) {
" INNER JOIN $user_table u ON (work.user_id = u.user_id) ".
" WHERE $extra_conditions $where_condition $condition_session ";
$result = Database::query($sql);
-
- $users_with_work = 0;
+
+ $users_with_work = 0;
if (Database::num_rows($result)) {
- $result = Database::fetch_array($result);
+ $result = Database::fetch_array($result);
$users_with_work = $result['count'];
}
- return $users_with_work;
+ return $users_with_work;
}
function get_work_user_list($start, $limit, $column, $direction, $work_id, $where_condition) {
- $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+ $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$iprop_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
- $user_table = Database::get_main_table(TABLE_MAIN_USER);
-
+ $user_table = Database::get_main_table(TABLE_MAIN_USER);
+
$session_id = api_get_session_id();
$course_id = api_get_course_int_id();
$group_id = api_get_group_id();
$course_info = api_get_course_info(api_get_course_id());
-
- $work_id = intval($work_id);
+
+ $work_id = intval($work_id);
$column = empty($column) ? : Database::escape_string($column);
$start = intval($start);
$limit = intval($limit);
if (!in_array($direction, array('asc','desc'))) {
- $direction = 'desc';
+ $direction = 'desc';
}
-
- $work_data = get_work_data_by_id($work_id);
- $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
+
+ $work_data = get_work_data_by_id($work_id);
+ $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
$condition_session = api_get_session_condition($session_id);
-
+
$locked = api_resource_is_locked_by_gradebook($work_id, LINK_STUDENTPUBLICATION);
if (!empty($work_data)) {
-
+
if (!empty($group_id)) {
- $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
+ $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
} else {
- $extra_conditions = " work.post_group_id = '0' ";
+ $extra_conditions = " work.post_group_id = '0' ";
}
if ($is_allowed_to_edit) {
$extra_conditions .= ' AND work.active IN (0, 1) ';
} else {
- $extra_conditions .= ' AND work.active IN (1) ';
-
- if (isset($course_info['show_score']) && $course_info['show_score'] == 1) {
+ $extra_conditions .= ' AND work.active IN (1) ';
+
+ if (isset($course_info['show_score']) && $course_info['show_score'] == 1) {
$extra_conditions .= " AND u.user_id = ".api_get_user_id()." ";
} else {
$extra_conditions .= '';
}
}
-
- $extra_conditions .= " AND parent_id = ".$work_id." ";
-
- $select = 'DISTINCT work.id as id, title as title, description, url, sent_date, contains_file, has_properties, view_properties,
+
+ $extra_conditions .= " AND parent_id = ".$work_id." ";
+
+ $select = 'DISTINCT work.id as id, title as title, description, url, sent_date, contains_file, has_properties, view_properties,
qualification, weight, allow_text_assignment, u.firstname, u.lastname, u.username, parent_id, accepted, qualificator_id';
-
+
$user_condition = "INNER JOIN $user_table u ON (work.user_id = u.user_id) ";
$work_condition = "$iprop_table prop INNER JOIN $work_table work ON (prop.ref = work.id AND prop.c_id = $course_id AND work.c_id = $course_id ) ";
-
+
$work_assignment = get_work_assignment_by_id($work_id);
-
+
$sql = "SELECT $select
- FROM $work_condition $user_condition $course_conditions
+ FROM $work_condition $user_condition $course_conditions
WHERE $extra_conditions $where_condition $condition_session ";
-
+
$sql .= " ORDER BY $column $direction ";
$sql .= " LIMIT $start, $limit";
-
+
$result = Database::query($sql);
$works = array();
-
+
while ($work = Database::fetch_array($result, 'ASSOC')) {
//var_dump($work);
- $item_id = $work['id'];
-
+ $item_id = $work['id'];
+
//Get the author ID for that document from the item_property table
$is_author = false;
$can_read = false;
-
- $item_property_data = api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
-
- if (!$is_allowed_to_edit && $item_property_data['insert_user_id'] == api_get_user_id()) {
+
+ $owner_id = $work['user_id'];
+
+ /* Because a bug found when saving items using the api_item_property_update()
+ the field $item_property_data['insert_user_id'] is not reliable. */
+
+ // $item_property_data = api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
+ //if (!$is_allowed_to_edit && $item_property_data['insert_user_id'] == api_get_user_id()) {
+ if (!$is_allowed_to_edit && $owner_id == api_get_user_id()) {
$is_author = true;
- }
+ }
+
if ($course_info['show_score'] == 0 ) {
$can_read = true;
}
-
+
if ($work['accepted'] == '0') {
$class = 'invisible';
} else {
$class = '';
- }
-
+ }
+
$qualification_exists = false;
if (!empty($work_data['qualification']) && intval($work_data['qualification']) > 0) {
$qualification_exists = true;
}
-
+
$qualification_string = '';
-
+
if ($qualification_exists) {
if ($work['qualification'] == '') {
$qualification_string = Display::label('-');
@@ -1645,52 +1651,52 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
$qualification_string = Display::label($work['qualification'], 'info');
}
}
-
- $add_string = '';
+
+ $add_string = '';
$time_expires = api_strtotime($work['expires_on'], 'UTC');
-
+
if (!empty($work_assignment['expires_on']) && $work_assignment['expires_on'] != '0000-00-00 00:00:00' && $time_expires && ($time_expires < api_strtotime($work['sent_date'], 'UTC'))) {
$add_string = Display::label(get_lang('Expired'),'important');
}
-
+
if (($can_read && $work['accepted'] == '1') || ($is_author && $work['accepted'] == '1') || $is_allowed_to_edit) {
-
+
//Firstname, lastname, username
$work['firstname'] = Display::div($work['firstname'], array('class' => $class));
$work['lastname'] = Display::div($work['lastname'], array('class' => $class));
$work['username'] = Display::div($work['username'], array('class' => $class));
-
+
if (strlen($work['title']) > 30) {
$short_title = substr($work['title'],0,27).'...';
$work['title'] = Display::span($short_title, array('class' => $class, 'title' => $work['title']));
} else {
$work['title'] = Display::div($work['title'], array('class' => $class));
}
-
-
+
+
//Type
- $work['type'] = build_document_icon_tag('file', $work['file']);
+ $work['type'] = build_document_icon_tag('file', $work['file']);
//File name
$link_to_download = null;
-
+
if ($work['contains_file']) {
$link_to_download = '
'.Display::return_icon('save.png', get_lang('Save'),array(), ICON_SIZE_SMALL).' ';
} else {
$link_to_download = '
'.Display::return_icon('default.png', get_lang('View'),array(), ICON_SIZE_SMALL).' ';
}
-
+
$send_to = Portfolio::share('work', $work['id'], array('style' => 'white-space:nowrap;'));
-
+
$work['qualification'] = $qualification_string;
//Date
- $work_date = api_convert_and_format_date($work['sent_date']);
- $work['sent_date'] = date_to_str_ago(api_get_local_time($work['sent_date'])).' '.$add_string.'
'.$work_date;
+ $work_date = api_convert_and_format_date($work['sent_date']);
+ $work['sent_date'] = date_to_str_ago(api_get_local_time($work['sent_date'])).' '.$add_string.'
'.$work_date;
//Actions
- $url = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'&id='.$work_id.'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']);
- $action = '';
+ $url = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'&id='.$work_id.'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']);
+ $action = '';
if ($is_allowed_to_edit) {
if ($locked) {
if ($qualification_exists) {
@@ -1723,8 +1729,8 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
$action .= Display::return_icon('delete_na.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
} else {
$action .= '
'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'';
- }
- } elseif ($is_author && (empty($work['qualificator_id']) || $work['qualificator_id'] == 0)) {
+ }
+ } elseif ($is_author && (empty($work['qualificator_id']) || $work['qualificator_id'] == 0)) {
if (api_is_allowed_to_session_edit(false, true)) {
$action .= '
'.Display::return_icon('edit.png', get_lang('Modify'),array(), ICON_SIZE_SMALL).'';
} else {
@@ -1738,17 +1744,17 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
}
//Status
- if (empty($work['qualificator_id'])) {
+ if (empty($work['qualificator_id'])) {
$qualificator_id = Display::label(get_lang('NotRevised'), 'warning');
} else {
$qualificator_id = Display::label(get_lang('Revised'), 'success');
- }
+ }
$work['qualificator_id'] = $qualificator_id;
$work['actions'] = $send_to.$link_to_download.$action;
$works[] = $work;
- }
+ }
}
- return $works;
+ return $works;
}
}
@@ -1767,24 +1773,24 @@ function send_reminder_users_without_publication($task_data) {
$task_title = !empty($task_data['title']) ? $task_data['title'] : basename($task_data['url']);
$subject = '[' . api_get_setting('siteName') . '] ';
-
+
// The body can be as long as you wish, and any combination of text and variables
-
+
$content = get_lang('ReminderToSubmitPendingTask')."\n".get_lang('CourseName').' : '.$_course['name']."\n";
$content .= get_lang('WorkName').' : '.$task_title."\n";
$list_users = get_list_users_without_publication($task_id);
-
- $mails_sent_to = array();
+
+ $mails_sent_to = array();
foreach ($list_users as $user) {
- $name_user = api_get_person_name($user[1], $user[0], null, PERSON_NAME_EMAIL_ADDRESS);
- $dear_line = get_lang('Dear')." ".api_get_person_name($user[1], $user[0]) .", \n\n";
- $body = $dear_line.$content;
-
- api_mail($name_user, $user[3], $subject, $body, $sender_name, $email_admin);
- $mails_sent_to[] = $name_user;
- }
- return $mails_sent_to;
+ $name_user = api_get_person_name($user[1], $user[0], null, PERSON_NAME_EMAIL_ADDRESS);
+ $dear_line = get_lang('Dear')." ".api_get_person_name($user[1], $user[0]) .", \n\n";
+ $body = $dear_line.$content;
+
+ api_mail($name_user, $user[3], $subject, $body, $sender_name, $email_admin);
+ $mails_sent_to[] = $name_user;
+ }
+ return $mails_sent_to;
}
/**
@@ -1795,7 +1801,7 @@ function send_reminder_users_without_publication($task_data) {
* @author Guillaume Viguier
* @author Julio Montoya Adding session support - 2011
*/
-function send_email_on_homework_creation($course_id) {
+function send_email_on_homework_creation($course_id) {
// Get the students of the course
$session_id = api_get_session_id();
if (empty($session_id)) {
@@ -1883,11 +1889,11 @@ function user_is_author($item_id, $user_id = null) {
if (empty($user_id)) {
$user_id = api_get_user_id();
}
-
- $is_author = false;
- $item_to_edit_data = api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
+
+ $is_author = false;
+ $item_to_edit_data = api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
$is_allowed_to_edit = api_is_allowed_to_edit();
-
+
if ($is_allowed_to_edit) {
$is_author = true;
} else {
@@ -1911,14 +1917,14 @@ function user_is_author($item_id, $user_id = null) {
* @author Julio Montoya Fixing query
*/
function get_list_users_without_publication($task_id) {
- $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+ $work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$table_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$session_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
//condition for the session
$session_id = api_get_session_id();
- $course_id = api_get_course_int_id();
+ $course_id = api_get_course_int_id();
$task_id = intval($task_id);
@@ -1934,39 +1940,39 @@ function get_list_users_without_publication($task_id) {
}
if ($session_id == 0){
- $sql_users = "SELECT cu.user_id, u.lastname, u.firstname, u.email FROM $table_course_user AS cu, $table_user AS u
+ $sql_users = "SELECT cu.user_id, u.lastname, u.firstname, u.email FROM $table_course_user AS cu, $table_user AS u
WHERE u.status!=1 and cu.course_code='".api_get_course_id()."' AND u.user_id=cu.user_id";
} else {
- $sql_users = "SELECT cu.id_user, u.lastname, u.firstname, u.email FROM $session_course_rel_user AS cu, $table_user AS u
+ $sql_users = "SELECT cu.id_user, u.lastname, u.firstname, u.email FROM $session_course_rel_user AS cu, $table_user AS u
WHERE u.status!=1 and cu.course_code='".api_get_course_id()."' AND u.user_id=cu.id_user and cu.id_session='".$session_id."'";
}
-
+
$group_id = api_get_group_id();
-
+
$new_group_user_list = array();
-
+
if ($group_id) {
- $group_user_list = GroupManager::get_subscribed_users($group_id);
+ $group_user_list = GroupManager::get_subscribed_users($group_id);
if (!empty($group_user_list)) {
foreach($group_user_list as $group_user) {
$new_group_user_list[] = $group_user['user_id'];
}
}
}
-
+
$result_users = Database::query($sql_users);
$users_without_tasks = array();
while ($row_users = Database::fetch_row($result_users)) {
-
+
if (in_array($row_users[0], $users_with_tasks)) continue;
- if ($group_id && !in_array($row_users[0], $new_group_user_list)) {
+ if ($group_id && !in_array($row_users[0], $new_group_user_list)) {
continue;
}
//$user_id = array_shift($row_users);
$row_users[0] = $row_users[1];
$row_users[1] = $row_users[2];
$row_users[2] = Display::encrypted_mailto_link($row_users[3]);
-
+
$users_without_tasks[] = $row_users;
}
return $users_without_tasks;
@@ -1987,7 +1993,7 @@ function display_list_users_without_publication($task_id) {
$table_header[] = array(get_lang('Email'), true);
// table_data
$table_data = get_list_users_without_publication($task_id);
-
+
$sorting_options = array();
$sorting_options['column'] = 1;
$paging_options = array();
'.get_lang('AdvancedParameters').'