');
+ if( (api_is_course_admin() || api_is_course_coach() || api_is_course_tutor()) && !($my_thread) ){
+ // thread qualify
+
+ $form->addElement('static','Group', '
'.get_lang('AlterQualifyThread').'');
+ $form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'Style="width:40px"');
+ $form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
+
+ $form -> addElement('html','
');
+ $form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'));
+ $form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="this.select();"');
+ $form->addElement('html','
');
+ }
if ($forum_setting['allow_post_notificiation'] AND isset($_user['user_id'])) {
$form->addElement('checkbox', 'post_notification', '', get_lang('NotifyByEmail').' ('.$_user['mail'].')');
@@ -1878,27 +1888,10 @@ function show_add_post_form($action='', $id='', $form_values='') {
$form->addElement('html','
'.get_lang('AddAnAttachment').'
');
$form->addElement('file','user_upload',get_lang('FileName'),'');
$form->addElement('textarea','file_comment',get_lang('FileComment'),array ('rows' => 4, 'cols' => 34));
-
+ $form->addElement('html','
');
- $form->addElement('static','Group', '
'.get_lang('AlterQualifyThread').'');
- $form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'Style="width:40px"');
- $form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
-
- $form -> addElement('html','
');
- $form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'));
- $form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="this.select();"');
- $form->addElement('html','
');
-
- $form->addElement('html','
'.get_lang('AdvancedParameters').'');
- $form->addElement('html','');
+
+ $form->addElement('static','Group','
'.get_lang('AdvancedParameters').'');
+ $form->addElement('html','
');
+
+ if (!isset($_GET['edit'])) {
$form->addElement('static','Group',''.get_lang('AlterQualifyThread').'');
$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'value="'.$current_thread['thread_qualify_max'].'" Style="width:40px"');
$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
@@ -2288,9 +2283,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
}
$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'),'value="'.$current_thread['thread_title_qualify'].'"');
$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="'.$current_thread['thread_weight'].'" Style="width:40px"');
- $form->addElement('html','
');
-
- $form->addElement('html','
'.get_lang('AddAnAttachment').'
');
+ $form->addElement('file','user_upload',get_lang('FileName'),'');
+ $form->addElement('textarea','file_comment',get_lang('FileComment'),array ('rows' => 4, 'cols' => 34));
+ $form->addElement('html','
');
if ($current_forum['allow_attachments']=='1' OR api_is_allowed_to_edit()) {
if (empty($form_values) AND !isset($_POST['SubmitPost'])) {
//edit_added_resources('forum_post',$current_post['post_id']);
@@ -2379,6 +2378,12 @@ function store_edit_post($values) {
//error_log($sql);
api_sql_query($sql,__FILE__, __LINE__);
+ if (empty($values['id_attach'])) {
+ add_forum_attachment_file($values['file_comment'],$values['post_id']);
+ } else {
+ edit_forum_attachment_file($values['file_comment'],$values['post_id'],$values['id_attach']);
+ }
+
if (api_is_course_admin()==true) {
$ccode = api_get_course_id();
$sid = api_get_session_id();
@@ -3193,6 +3198,105 @@ function search_link() {
}
return $return;
}
+/**
+ * This function add a attachment file into forum
+ * @param string a comment about file
+ * @param int last id from forum_post table
+ *
+ */
+function add_forum_attachment_file($file_comment,$last_id) {
+
+ global $_course;
+ $agenda_forum_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
+ // Storing the attachments
+
+ if(!empty($_FILES['user_upload']['name'])) {
+ $upload_ok = process_uploaded_file($_FILES['user_upload']);
+ }
+
+ if (!empty($upload_ok)) {
+ $courseDir = $_course['path'].'/upload/forum';
+ $sys_course_path = api_get_path(SYS_COURSE_PATH);
+ $updir = $sys_course_path.$courseDir;
+
+ // Try to add an extension to the file if it hasn't one
+ $new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
+ // user's file name
+ $file_name =$_FILES['user_upload']['name'];
+
+ if (!filter_extension($new_file_name)) {
+ Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+ } else {
+ $new_file_name = uniqid('');
+ $new_path=$updir.'/'.$new_file_name;
+ $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+ $safe_file_comment= Database::escape_string($file_comment);
+ $safe_file_name = Database::escape_string($file_name);
+ $safe_new_file_name = Database::escape_string($new_file_name);
+ // Storing the attachments if any
+ if ($result) {
+ $sql="INSERT INTO $agenda_forum_attachment(filename,comment, path,post_id,size)
+ VALUES ( '$safe_file_name', '$safe_file_comment', '$safe_new_file_name' , '$last_id', '".$_FILES['user_upload']['size']."' )";
+ $result=api_sql_query($sql, __LINE__, __FILE__);
+ $message.=' / '.get_lang('FileUploadSucces').'
';
+
+ $last_id_file=Database::insert_id();
+ api_item_property_update($_course, TOOL_FORUM_ATTACH, $last_id_file ,'ForumAttachmentAdded', api_get_user_id());
+
+ }
+ }
+ }
+}
+
+/**
+ * This function edit a attachment file into forum
+ * @param string a comment about file
+ * @param int Post Id
+ * @param int attachment file Id
+ */
+function edit_forum_attachment_file($file_comment,$post_id,$id_attach) {
+
+ global $_course;
+ $table_forum_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
+ // Storing the attachments
+
+ if(!empty($_FILES['user_upload']['name'])) {
+ $upload_ok = process_uploaded_file($_FILES['user_upload']);
+ }
+
+ if (!empty($upload_ok)) {
+ $courseDir = $_course['path'].'/upload/forum';
+ $sys_course_path = api_get_path(SYS_COURSE_PATH);
+ $updir = $sys_course_path.$courseDir;
+
+ // Try to add an extension to the file if it hasn't one
+ $new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
+ // user's file name
+ $file_name =$_FILES['user_upload']['name'];
+
+ if (!filter_extension($new_file_name)) {
+ Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+ } else {
+ $new_file_name = uniqid('');
+ $new_path=$updir.'/'.$new_file_name;
+ $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+ $safe_file_comment= Database::escape_string($file_comment);
+ $safe_file_name = Database::escape_string($file_name);
+ $safe_new_file_name = Database::escape_string($new_file_name);
+ $safe_post_id = (int)$post_id;
+ $safe_id_attach = (int)$id_attach;
+ // Storing the attachments if any
+ if ($result) {
+ $sql="UPDATE $table_forum_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', post_id = '$safe_post_id', size ='".$_FILES['user_upload']['size']."'
+ WHERE id = '$safe_id_attach'";
+ $result=api_sql_query($sql, __LINE__, __FILE__);
+
+ api_item_property_update($_course, TOOL_FORUM_ATTACH, $safe_id_attach ,'ForumAttachmentUpdated', api_get_user_id());
+
+ }
+ }
+ }
+}
/**
* Show a list with all the attachments according to the post's id
@@ -3205,7 +3309,7 @@ function search_link() {
function get_attachment($post_id) {
global $forum_table_attachment;
$row=array();
- $sql = 'SELECT path, filename,comment FROM '. $forum_table_attachment.' WHERE post_id ="'.$post_id.'"';
+ $sql = 'SELECT id, path, filename,comment FROM '. $forum_table_attachment.' WHERE post_id ="'.$post_id.'"';
$result=api_sql_query($sql, __FILE__, __LINE__);
if (Database::num_rows($result)!=0) {
$row=Database::fetch_array($result);
@@ -3213,28 +3317,37 @@ function get_attachment($post_id) {
return $row;
}
/**
- * Delete the all the attachments from the DB and the file according to the post's id
+ * Delete the all the attachments from the DB and the file according to the post's id or attach id(optional)
* @param post id
+ * @param attach id (optional)
* @author Julio Montoya Dokeos
* @version avril 2008, dokeos 1.8.5
*/
-function delete_attachment($id) {
- global $forum_table_attachment;
+function delete_attachment($post_id,$id_attach=0) {
global $_course;
+ $forum_table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
- $attach_list=get_attachment($id);
- $sql = 'DELETE FROM '. $forum_table_attachment.' WHERE post_id ="'.$id.'"';
- $result=api_sql_query($sql, __FILE__, __LINE__);
+ $cond = (!empty($id_attach))?" id = ".(int)$id_attach."" : " post_id = ".(int)$post_id."";
+
+ $sql="DELETE FROM $forum_table_attachment WHERE $cond ";
+
+ $result=api_sql_query($sql, __LINE__, __FILE__);
+ $last_id_file=Database::insert_id();
+ // update item_property
+ api_item_property_update($_course, TOOL_FORUM_ATTACH, $id_attach ,'ForumAttachmentDelete', api_get_user_id());
+
+ if (!empty($result) && !empty($id_attach)) {
+ $message=get_lang(get_lang('AttachmentFileDeleteSuccess'));
+ Display::display_confirmation_message($message);
+ }
$courseDir = $_course['path'].'/upload/forum';
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$updir = $sys_course_path.$courseDir;
$my_path =isset($attach_list['path']) ? $attach_list['path'] : null;
$file =$updir.'/'.$my_path;
-
- api_item_property_update($_course, TOOL_FORUM_ATTACH, $id ,'ForumAttachmentDelete', api_get_user_id());
-
+
if (Security::check_abs_path($file,$updir) ) {
@ unlink($file);
}
diff --git a/main/forum/reply.php b/main/forum/reply.php
index e80750f6cb..f7638f1449 100644
--- a/main/forum/reply.php
+++ b/main/forum/reply.php
@@ -92,6 +92,19 @@ if(isset($_GET['origin'])) {
require 'forumconfig.inc.php';
require_once 'forumfunction.inc.php';
+// javascript
+$htmlHeadXtra[] = '';
/*
==============================================================================
MAIN DISPLAY SECTION
diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php
index 8ed995f858..99a75fc7c3 100644
--- a/main/forum/viewforum.php
+++ b/main/forum/viewforum.php
@@ -407,20 +407,24 @@ if(is_array($threads)) {
} elseif ($origin!='learnpath') {
$last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC";
$last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__);
- $last_post_row=mysql_fetch_array($last_post_result);
+ $last_post_row=Database::fetch_array($last_post_result);
$name=$last_post_row['firstname'].' '.$last_post_row['lastname'];
$last_post=$last_post_row['post_date']." ".get_lang('By').' '.display_user_link($last_post_row['poster_id'], $name);
} else {
$last_post_sql="SELECT post.*, user.firstname, user.lastname FROM $table_posts post, $table_users user WHERE post.poster_id=user.user_id AND visible='1' AND thread_id='".$row['thread_id']."' ORDER BY post_id DESC";
$last_post_result=api_sql_query($last_post_sql, __FILE__, __LINE__);
- $last_post_row=mysql_fetch_array($last_post_result);
+ $last_post_row=Database::fetch_array($last_post_result);
$name=$last_post_row['firstname'].' '.$last_post_row['lastname'];
$last_post=$last_post_row['post_date']." ".get_lang('By').' '.$name;
}
echo "\t\t".$last_post." | \n";
echo "\t\t";
+ // get attach id
+ $attachment_list=get_attachment($row['post_id']);
+ $id_attach = !empty($attachment_list)?$attachment_list['id']:'';
+
if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) {
- echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
+ echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
echo "".icon('../img/delete.gif',get_lang('Delete'))."";
display_visible_invisible_icon('thread', $row['thread_id'], $row['visibility'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup']));
display_lock_unlock_icon('thread',$row['thread_id'], $row['locked'], array("forum"=>$my_forum,'origin'=>$origin,"gidReq"=>$_SESSION['toolgroup']));
diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php
index eabed049da..aba10e0f43 100644
--- a/main/forum/viewforumcategory.php
+++ b/main/forum/viewforumcategory.php
@@ -238,7 +238,7 @@ if ($action_forums!='add') {
echo "\n";
$my_session=isset($_SESSION['id_session']) ? $_SESSION['id_session'] : null;
$forum_categories_list='';
- echo "\t\n\t\t| ";
+ echo "\t | \n\t\t";
echo ''.prepare4display($forum_category['cat_title']).'
';
echo ''.prepare4display($forum_category['cat_comment']).'';
echo " | \n";
diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php
index a6237e4c12..7d07b4e9a2 100644
--- a/main/forum/viewthread_flat.inc.php
+++ b/main/forum/viewthread_flat.inc.php
@@ -23,6 +23,11 @@
/**
* @package dokeos.forum
*/
+//delete attachment file
+if ((isset($_GET['action']) && $_GET['action']=='delete_attach') && isset($_GET['id_attach'])) {
+ delete_attachment(0,$_GET['id_attach']);
+}
+
if (isset($current_thread['thread_id'])){
$rows=get_posts($current_thread['thread_id']);
@@ -56,10 +61,13 @@ foreach ($rows as $row) {
echo $name. '
';
}
echo $row['post_date'].'
';
+ // get attach id
+ $attachment_list=get_attachment($row['post_id']);
+ $id_attach = !empty($attachment_list)?$attachment_list['id']:'';
// The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
// The course admin him/herself can do this off course always
if (($current_forum['allow_edit']==1 AND $row['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
- echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
+ echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
}
if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) {
echo "".icon('../img/delete.gif',get_lang('Delete'))."\n";
@@ -133,7 +141,10 @@ foreach ($rows as $row) {
echo ' '.$user_filename.' ';
- echo '
';
+ echo '';
+ if (($current_forum['allow_edit']==1 AND $row['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
+ echo ' '.Display::return_icon('delete.gif',get_lang('Delete')).'
';
+ }
echo ' ';
}
diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php
index 3dcad2e100..2688b13b5b 100644
--- a/main/forum/viewthread_nested.inc.php
+++ b/main/forum/viewthread_nested.inc.php
@@ -35,6 +35,11 @@ if(isset($_GET['origin']))
$origin = Security::remove_XSS($_GET['origin']);
}
+//delete attachment file
+if ((isset($_GET['action']) && $_GET['action']=='delete_attach') && isset($_GET['id_attach'])) {
+ delete_attachment(0,$_GET['id_attach']);
+}
+
$rows=get_posts($_GET['thread']); // note: this has to be cleaned first
$rows=calculate_children($rows);
$count=0;
@@ -65,10 +70,13 @@ foreach ($rows as $post) {
}
echo display_user_link($post['user_id'], $name, $origin).'
';
echo $post['post_date'].'
';
+ // get attach id
+ $attachment_list=get_attachment($post['post_id']);
+ $id_attach = !empty($attachment_list)?$attachment_list['id']:'';
// The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
// The course admin him/herself can do this off course always
if (($current_forum['allow_edit']==1 AND $post['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
- echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
+ echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
}
if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])) {
echo "".icon('../img/delete.gif',get_lang('Delete'))."\n";
@@ -136,7 +144,10 @@ foreach ($rows as $post) {
echo ' '.$user_filename.' ';
- echo '
';
+ echo '';
+ if (($current_forum['allow_edit']==1 AND $post['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
+ echo ' '.Display::return_icon('delete.gif',get_lang('Delete')).'
';
+ }
echo '';
}
diff --git a/main/forum/viewthread_threaded.inc.php b/main/forum/viewthread_threaded.inc.php
index 76dc3547d5..198f5df06a 100644
--- a/main/forum/viewthread_threaded.inc.php
+++ b/main/forum/viewthread_threaded.inc.php
@@ -75,6 +75,10 @@ if(isset($_GET['origin']))
$origin = Security::remove_XSS($_GET['origin']);
}
+//delete attachment file
+if ((isset($_GET['action']) && $_GET['action']=='delete_attach') && isset($_GET['id_attach'])) {
+ delete_attachment(0,$_GET['id_attach']);
+}
// --------------------------------------
// Displaying the thread (structure)
// --------------------------------------
@@ -230,11 +234,15 @@ else
if (api_get_course_setting('allow_user_image_forum')) {echo '
'.display_user_image($rows[$display_post_id]['user_id'],$name, $origin).'
'; }
echo display_user_link($rows[$display_post_id]['user_id'], $name, $origin).'
';
echo $rows[$display_post_id]['post_date'].'
';
+// get attach id
+$attachment_list=get_attachment($display_post_id);
+$id_attach = !empty($attachment_list)?$attachment_list['id']:'';
+
// The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
// The course admin him/herself can do this off course always
if (($current_forum['allow_edit']==1 AND $rows[$display_post_id]['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session'])))
{
- echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
+ echo "".icon('../img/edit.gif',get_lang('Edit'))."\n";
}
if (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))
{
@@ -331,7 +339,10 @@ if (!empty($attachment_list))
echo ' '.$user_filename.' ';
- echo '
';
+ echo '';
+ if (($current_forum['allow_edit']==1 AND $rows[$display_post_id]['user_id']==$_user['user_id']) or (api_is_allowed_to_edit(false,true) && !(api_is_course_coach() && $current_forum['session_id']!=$_SESSION['id_session']))) {
+ echo ' '.Display::return_icon('delete.gif',get_lang('Delete')).'
';
+ }
echo '';
}
|