Fixing query when deleting an announcement

main/announcements/announcements.inc.php

@@ -228,7 +228,10 @@ class AnnouncementManager  {
                 echo '<br/>';                
                 echo Display::return_icon('attachment.gif',get_lang('Attachment'));
                 echo '<a href="'.$full_file_name.' "> '.$user_filename.' </a>';
-                echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
+                echo ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
+                if (api_is_allowed_to_edit(false,true)) {
+                    echo Display::url(Display::return_icon('delete.png', get_lang('Delete'),'',16), api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok);
+                }
                 echo '</td></tr>';
             }           
     		echo "</table>";
@@ -1218,7 +1221,7 @@ class AnnouncementManager  {
 		$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 		$id = intval($id);
 		$course_id = api_get_course_int_id();
-		$sql = "DELETE FROM $tbl_announcement_attachment WHERE c_id $course_id AND id = $id";
+		$sql = "DELETE FROM $tbl_announcement_attachment WHERE c_id = $course_id AND id = $id";
 		$result = Database::query($sql);
 		// update item_property
 		//api_item_property_update($_course, 'announcement_attachment',  $id,'AnnouncementAttachmentDeleted', api_get_user_id());

main/announcements/announcements.php

@@ -215,7 +215,7 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 		}
 
 		if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
-			// tooledit : visibility = 2 : only visibile for platform administrator
+			// tooledit : visibility = 2 : only visible for platform administrator
 			if ($ctok == $_GET['sec_token']) {
 				AnnouncementManager::delete_announcement($_course, $id);
 				//delete_added_resource("Ad_Valvas", $delete);
@@ -229,10 +229,16 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
 	}
     
       //delete attachment file
-    if (isset($_GET['action']) && $_GET['action'] == 'delete') {
+    if (isset($_GET['action']) && $_GET['action'] == 'delete_attachment') {
         $id = $_GET['id_attach'];
+        if ($ctok == $_GET['sec_token']) {
+            if (api_is_allowed_to_edit()) {
                 AnnouncementManager::delete_announcement_attachment_file($id);
             }
+        }
+    }    
+    
+	
   
 	/*
 		Delete all announcements
@@ -1144,7 +1150,6 @@ if ($display_announcement_list) {
     				} else {
     				    $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down'));
     				}    				    
-    				    
     			    if (api_is_allowed_to_edit(false,true)) {
                         $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset))."')) return false;\">".
                             Display::return_icon('delete.png', get_lang('Delete'),'',22).