From b37747892c9d92a3b428b9a1ba4bdb66829b80d7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 18 Jan 2010 16:37:33 -0500
Subject: [PATCH] Let users see the announcement attachments

---
 main/announcements/announcements.inc.php |  3 +-
 main/announcements/announcements.php     | 50 ++++++++++++++++--------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 22e6003bb8..c6c28d4761 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -1194,8 +1194,7 @@ function delete_announcement_attachment_file($id) {
 	global $_course;
 	$tbl_announcement_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 	$id=Database::escape_string($id);	
-	$sql="DELETE FROM $tbl_announcement_attachment WHERE id = $id";
-	error_log($sql);
+	$sql="DELETE FROM $tbl_announcement_attachment WHERE id = $id";	
 	$result=Database::query($sql, __FILE__,__LINE__);
 	// update item_property
 	//api_item_property_update($_course, 'announcement_attachment',  $id,'AnnouncementAttachmentDeleted', api_get_user_id());
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 084f358144..c4f576218a 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -1487,30 +1487,46 @@ if ($display_announcement_list && !$surveyid) {
 					
 				// show attachment list
 				$attachment_list = array();
-				$attachment_list = get_attachment($myrow['id']);
+				$attachment_list = get_attachment($myrow['id']);				
 								
 				if (count($attachment_list)>0) {
-				$realname=$attachment_list['path'];
-				$user_filename=$attachment_list['filename'];
-				$full_file_name = 'download.php?file='.$realname;
-				echo '<br/>';
-				echo '<br/>';
-				echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-				echo '<a href="'.$full_file_name.'';
-				echo ' "> '.$user_filename.' </a>';
-				echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
-				
-				if (api_is_allowed_to_edit()) {
-					echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&id_attach='.$attachment_list['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a><br />';
-				}
-				
-			}					
+					$realname=$attachment_list['path'];
+					$user_filename=$attachment_list['filename'];
+					$full_file_name = 'download.php?file='.$realname;
+					echo '<br/>';
+					echo '<br/>';
+					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo '<a href="'.$full_file_name.'';
+					echo ' "> '.$user_filename.' </a>';
+					echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
+					
+					if (api_is_allowed_to_edit()) {
+						echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete&id_attach='.$attachment_list['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a><br />';
+					}					
+				}					
 	    		
 																	
 				echo "</td>\n</tr>\n";
 
 				$iterator ++;
-			} // is_allowed_to_edit
+			} else { // end of is_allowed_to_edit 
+				//students view
+				// show attachment list
+				$attachment_list = array();
+				$attachment_list = get_attachment($myrow['id']);				
+								
+				if (count($attachment_list)>0) {
+					$realname=$attachment_list['path'];
+					$user_filename=$attachment_list['filename'];
+					$full_file_name = 'download.php?file='.$realname;
+					echo '<br/>';
+					echo '<br/>';
+					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo '<a href="'.$full_file_name.'';
+					echo ' "> '.$user_filename.' </a>';
+					echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';					
+				}	
+			}
 
 			echo "<tr><td width=\"100%\" colspan=\"3\"><a href=\"#top\">".Display::return_icon('top.gif', get_lang('Top'))."</a></td></tr>";