From a07ef4ea19da3672124b973b99e0c3e9ffd73b18 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 27 Mar 2009 22:17:47 +0100
Subject: [PATCH] [svn r19390] Minor - some code cleaning lang vars changed

---
 main/forum/forumfunction.inc.php | 63 +++++++++++++++++---------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index f1b7c5b78d..81570befed 100644
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -3805,56 +3805,59 @@ function get_thread_user_post($course_db, $thread_id, $user_id )
  * @param int user id
  * @param string db course name
  * @return string 
- * @author Christian Fasanando
+ * @author Christian Fasanando / J. M
  **/
  
  function get_all_post_from_user($user_id, $course_db) 
- { 	
+ { 	 
  	$j=0;
-	$forums = get_forums();
+	$forums = get_forums();	
 	krsort($forums);
+	$forum_results = '';	
  	foreach($forums as $forum) {	
 		if ($j<=4) { 		
 	 		$threads = get_threads($forum['forum_id']); 		
-	 		if (is_array($threads)) { 		
-	 			echo '<div id="social-forum">';
+	 		if (is_array($threads)) {	 			
 	 			/*echo Display::return_icon('forum.gif'); 		
 	 			echo $forum['forum_title'];*/
 	 			$my_course_db=explode('_',$course_db);
-	 			$my_course_code=$my_course_db[1];
-	 			echo '<div class="clear"></div><br />';
-	 			echo '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('forum.gif').'&nbsp;&nbsp;&nbsp;&nbsp;'.$forum['forum_title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../forum/viewforum.php?cidReq='.$my_course_code.'&gidReq=&forum='.$forum['forum_id'].' " >'.get_lang('SeeForum').'</a></div></div>';
-	 			echo '<br / >';	echo '<br / >'; 
-	 			$i=0;			
+	 			$my_course_code=$my_course_db[1];	 			 
+	 			$i=0;
+	 			$hand_forums = ''; 	
+	 			$post_counter = 0;		 			
 		 		foreach($threads as $thread) {
-		 				if ($i<=4) { 		
+		 				if ($i<=4) {
 			 				$post_list = get_thread_user_post_limit($course_db, $thread['thread_id'], $user_id, 1);
+			 				$post_counter = count($post_list);	
 			 				if (is_array($post_list) && count($post_list)>0) {
-			 					echo '<div id="social-thread">';
-				 				echo Display::return_icon('forumthread.gif'); 	
-				 				echo $thread['thread_title'].' ';
-				 			/*	echo '<br / >'; 				echo '<br / >'; 				
-				 				echo '<strong>'.$thread['post_title'].'</strong>'; echo '<br / >';
-				 				echo cut($thread['post_text'], 150);
-				 				echo '<br / >';
-				 				*/	 					
+			 					$hand_forums.= '<div id="social-thread">';
+				 				$hand_forums.= Display::return_icon('forumthread.gif'); 	
+				 				$hand_forums.= $thread['thread_title'].' ';
 				 				foreach($post_list as $posts) {
-				 					echo '<div id="social-post">';
-				 					echo '<strong>'.$posts['post_title'].'</strong>'; echo '<br / >';
-				 					echo cut($posts['post_text'], 150); 					
-				 					echo '</div>';	
-				 					echo '<br / >';
+				 					$hand_forums.= '<div id="social-post">';
+				 					$hand_forums.= '<strong>'.$posts['post_title'].'</strong>'; 
+				 					$hand_forums.= '<br / >';
+				 					$hand_forums.= cut($posts['post_text'], 150); 					
+				 					$hand_forums.= '</div>';	
+				 					$hand_forums.= '<br / >';
 				 				}
 			 				}
-			 			echo '</div>';
+			 			$hand_forums.= '</div>';
 		 			}	
 		 			$i++;
-		 		}
-	 		}
-	 		echo '</div>'; 
+				}
+				if ($post_counter > 0 ) {
+					$forum_results .='<div id="social-forum">';
+	 				$forum_results .='<div class="clear"></div><br />';
+	 				$forum_results .='<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('forum.gif').'&nbsp;&nbsp;&nbsp;&nbsp;'.$forum['forum_title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../forum/viewforum.php?cidReq='.$my_course_code.'&gidReq=&forum='.$forum['forum_id'].' " >'.get_lang('SeeForum').'</a></div></div>';
+	 				$forum_results .='<br / ><br / >';					
+					$forum_results .=$hand_forums;
+					$forum_results .='</div>'; 
+				}
+	 		}	 		
  		} $j++;		
- 	}	
- 	//$list = get_thread_user_post($course['dbName'],$thread_id, $user_id);
+ 	}
+ 	return $forum_results;
  }
  
 function get_thread_user_post_limit($course_db, $thread_id, $user_id, $limit=10)