Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.62 -r1.63
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	27 Oct 2006 19:35:07 -0000	1.62
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	30 Oct 2006 04:59:59 -0000	1.63
@@ -195,7 +195,8 @@
 					Iterator iter = forum.getMessages().iterator();
 					while(iter.hasNext()){
 						Message topic = (Message) iter.next();
-						if(topic.getCreatedBy() == null){
+						//contentFolderID != -1 means it is sysadmin: LDEV-906 
+						if(topic.getCreatedBy() == null && !StringUtils.equals(contentFolderID,"-1")){
 							//get login user (author)
 							HttpSession ss = SessionManager.getSession();
 							//get back login user DTO
@@ -211,16 +212,18 @@
 			}else{
 				topics = forumService.getAuthoredTopics(forum.getUid());
 				//failure tolerance: if current contentID is defaultID, the createBy will be null.
-				for (MessageDTO messageDTO : topics) {
-					if(StringUtils.isBlank(messageDTO.getAuthor())){
-						//get login user (author)
-						HttpSession ss = SessionManager.getSession();
-						//get back login user DTO
-						UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-						ForumUser fuser = new ForumUser(user,null);
-						messageDTO.setAuthor(fuser.getFirstName()+" "+fuser.getLastName());
+				//contentFolderID != -1 means it is sysadmin: LDEV-906 
+				if(!StringUtils.equals(contentFolderID,"-1"))
+					for (MessageDTO messageDTO : topics) {
+						if(StringUtils.isBlank(messageDTO.getAuthor())){
+							//get login user (author)
+							HttpSession ss = SessionManager.getSession();
+							//get back login user DTO
+							UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+							ForumUser fuser = new ForumUser(user,null);
+							messageDTO.setAuthor(fuser.getFirstName()+" "+fuser.getLastName());
+						}
 					}
-				}
 			}
 			//initialize attachmentList
 			List attachmentList = getAttachmentList(sessionMap);
@@ -281,16 +284,20 @@
 			forumService = getForumManager();
 			
 			//*******************************Handle user*******************
-			//try to get form system session
-			HttpSession ss = SessionManager.getSession();
-			//get back login user DTO
-			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
-			if(forumUser == null){
-				forumUser = new ForumUser(user,null);
-				forumService.createUser(forumUser);
-			}
-			
+			String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+			ForumUser forumUser = null;
+			//check whether it is sysadmin:LDEV-906 
+			if(!StringUtils.equals(contentFolderID,"-1" )){
+				//try to get form system session
+				HttpSession ss = SessionManager.getSession();
+				//get back login user DTO
+				UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+				forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
+				if(forumUser == null){
+					forumUser = new ForumUser(user,null);
+					forumService.createUser(forumUser);
+				}
+			}			
 			//**********************************Get Forum PO*********************
 			Forum forumPO = forumService.getForumByContentId(forumForm.getToolContentID());
 			if(forumPO == null){
@@ -584,7 +591,9 @@
 		
 		//check whether this user exist or not
 		ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue()));
-		if(forumUser == null){
+		String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
+		//check whether it is sysadmin:LDEV-906 
+		if(forumUser == null && !StringUtils.equals(contentFolderID,"-1" )){
 			//if user not exist, create new one in database
 			forumUser = new ForumUser(user,null);
 		}
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/topiclist.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	19 Oct 2006 03:15:54 -0000	1.6
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	30 Oct 2006 04:59:59 -0000	1.7
@@ -28,7 +28,13 @@
 					
 				</td>
 				<td>
-					<c:out value="${topic.author}"/>
+					<c:set var="author" value="${topic.author}"/>
+					<c:if test="${empty author}">
+						<c:set var="author">
+							<fmt:message key="label.default.user.name"/>
+						</c:set>
+					</c:if>
+					${author}
 				</td>
 				<td>
 					<lams:Date value="${topic.message.updated}"/>
Index: lams_tool_forum/web/jsps/authoring/message/view.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/Attic/view.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_forum/web/jsps/authoring/message/view.jsp	18 Oct 2006 09:23:26 -0000	1.13
+++ lams_tool_forum/web/jsps/authoring/message/view.jsp	30 Oct 2006 04:59:59 -0000	1.14
@@ -19,7 +19,14 @@
 			<tr>
 				<td class="posted-by">
 					<fmt:message key="lable.topic.subject.by" />
-					${topic.author} -
+					<c:set var="author" value="${topic.author}"/>
+					<c:if test="${empty author}">
+						<c:set var="author">
+							<fmt:message key="label.default.user.name"/>
+						</c:set>
+					</c:if>
+					${author}
+					-
 					<lams:Date value="${topic.message.created}" />
 				</td>
 			</tr>