Explorar o código

Fixing social network UI see #190

Julio Montoya %!s(int64=15) %!d(string=hai) anos
pai
achega
d98471d458

+ 80 - 54
main/auth/profile.php

@@ -21,7 +21,12 @@ $cidReset = true;
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
-$this_section = SECTION_MYPROFILE;
+if (api_get_setting('allow_social_tool') == 'true') {
+	$this_section = SECTION_SOCIAL;
+} else {
+	$this_section = SECTION_MYPROFILE;
+}
+
 $_SESSION['this_section'] = $this_section;
 
 if (!(isset($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'], true)) {
@@ -727,24 +732,24 @@ if (isset($_GET['show'])) {
 */
 Display :: display_header('');
 
-if (api_get_setting('extended_profile') == 'true') {
-	echo '<div class="actions">';
-	
-	if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
-		echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'&nbsp;'.get_lang('ViewSharedProfile').'</a>';
-	}
-	if (api_get_setting('allow_message_tool') == 'true') {
-		echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
-	}	
-	$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
-				 
-	if (isset($_GET['type']) && $_GET['type'] == 'extended') {
-		echo '<a href="profile.php?type=reduced'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</a>';
-	} else {
-		echo '<a href="profile.php?type=extended'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</a>';
+if (api_get_setting('allow_social_tool') != 'true') {
+	if (api_get_setting('extended_profile') == 'true') {
+		echo '<div class="actions">';	
+		if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
+			echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'&nbsp;'.get_lang('ViewSharedProfile').'</a>';
+		}
+		if (api_get_setting('allow_message_tool') == 'true') {
+			echo '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png').' '.get_lang('Messages').'</a>';
+		}	
+		$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
+					 
+		if (isset($_GET['type']) && $_GET['type'] == 'extended') {
+			echo '<a href="profile.php?type=reduced'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</a>';
+		} else {
+			echo '<a href="profile.php?type=extended'.$show.'">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</a>';
+		}
+		echo '</div>';
 	}
-
-	echo '</div>';
 }
 
 if (!empty($file_deleted)) {
@@ -801,45 +806,66 @@ $big_image_width = $big_image_size[0];
 $big_image_height = $big_image_size[1];
 $url_big_image = $big_image.'?rnd='.time();
 
-// Style position:absolute has been removed for Opera-compatibility. 
-//echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
-echo '<div id="image-message-container" style="float:right;display:inline;padding:3px;width:250px;" >';
 
-if ($image == 'unknown.jpg') {
-	echo '<img '.$img_attributes.' />';
+if (api_get_setting('allow_social_tool') == 'true') {
+	
+	echo '<div class="social-header">';
+	
+	echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>';	
+	echo '<td width="15px">&nbsp;</td>';
+	
+	if (api_get_setting('extended_profile') == 'true') {
+		//echo '<td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>';
+		echo '<td bgcolor="#32578b">';
+		
+		$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
+					 
+		if (isset($_GET['type']) && $_GET['type'] == 'extended') {
+			echo '<a href="profile.php?type=reduced'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</span></a>';
+		} else {
+			echo '<a href="profile.php?type=extended'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</span></a>';
+		}
+		echo '</td>';
+	}
+	echo '</tr></table>';
+	echo '</div>';
+		
+	
+	echo '<div id="social-content">';
+	
+		echo '<div id="social-content-left">';
+		SocialManager::show_social_menu('home', null, $user_id, $show_full_profile);
+		echo '</div>';
+	
+		echo '<div id="social-content-right">';
+			// Style position:absolute has been removed for Opera-compatibility. 
+			//echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
+			echo '<div id="image-message-container" style="float:right;display:inline;padding:3px;width:250px;" >';
+			
+			if ($image == 'unknown.jpg') {
+				echo '<img '.$img_attributes.' />';
+			} else {
+				echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
+			}
+			echo '</div>';		
+			$form->display();
+		echo '</div>';
+	echo '</div>';
+	
+	
 } else {
-	echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
-}
-/* This was moved to user_portal.php
-if (api_get_setting('allow_message_tool') == 'true') {
-	include api_get_path(LIBRARY_PATH).'message.lib.php';
-	$number_of_new_messages = MessageManager::get_new_messages();
-	$number_of_outbox_message = MessageManager::get_number_of_messages_sent();
-	$cant_out_box = ' ('.$number_of_outbox_message.')';
-	$cant_msg = ' ('.$number_of_new_messages.')';
-	$number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
-	//echo '<div class="message-view" style="display:none;">'.get_lang('ViewMessages').'</div>';
-	echo '<div class="message-content">
-			<h2 class="message-title">'.get_lang('Messages').'</h2>
-			<p>
-				<a href="../social/index.php#remote-tab-2" class="message-body">'.get_lang('Inbox').$cant_msg.' </a><br />
-				<a href="../social/index.php#remote-tab-3" class="message-body">'.get_lang('Outbox').$cant_out_box.'</a><br />
-			</p>';
-
-	//if (api_get_setting('allow_social_tool') == 'true') {
-	//	 if ($number_of_new_messages_of_friend > 0) {
-	//		echo '<div class="message-content-internal">';
-	//		echo '<a href="../social/index.php#remote-tab-4" style="color:#000000">'. Display::return_icon('info3.gif', get_lang('NewMessage'), 'align="absmiddle"').'&nbsp;'.get_lang('Invitation ').'('.$number_of_new_messages_of_friend.')'.'</a>';
-	//		echo '</div><br />';
-	//	 }
-	// }
-	echo '<img src="'.api_get_path(WEB_IMG_PATH).'delete.gif" alt="'.get_lang('Close').'" title="'.get_lang('Close').'"  class="message-delete" />';
-	if ($number_of_new_messages_of_friend > 0) {
-		echo '<br />';
+	// Style position:absolute has been removed for Opera-compatibility. 
+	//echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
+	echo '<div id="image-message-container" style="float:right;display:inline;padding:3px;width:250px;" >';
+	
+	if ($image == 'unknown.jpg') {
+		echo '<img '.$img_attributes.' />';
+	} else {
+		echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
 	}
 	echo '</div>';
+	$form->display();
 }
-*/
-echo '</div>';
-$form->display();
+
+
 Display :: display_footer();

+ 35 - 9
main/css/blue_lagoon/default.css

@@ -2261,7 +2261,7 @@ div.comments {
 /*SOCIAL TOOL*/
 div.image-social-content {
 	float:left;
-	border:1px solid #B8C8DC;
+	border:1px dotted #ccc;
 	margin:2px;
 	padding: 8px 4px 4px 4px;
 	background: #ffffff;
@@ -2331,7 +2331,8 @@ div.image-social-content center.friend {
 }
 
 .social-content-image {
-margin-bottom:10px;
+	margin-bottom:10px;
+	margin-top:2px;
 }
 
 #social-content-left {
@@ -2339,7 +2340,7 @@ margin-bottom:10px;
 	height:auto;
 	margin-right:16px;
 	min-height:300px;
-	width:160px;
+	width:200px;
 	overflow:hidden;	
 }
 .social-content-description {
@@ -2368,7 +2369,9 @@ margin-bottom:10px;
 	padding-left:10px;
 	width:200px;
 }
+
 /* general layout of the profile page */
+
 #social-profile-wrapper {
 	width: 100%;
 	text-align:left;
@@ -2395,7 +2398,7 @@ margin-bottom:10px;
 
 /*  SOCIAL MENU VERTICAL */
 .social-menu  {
-	width:150px;
+	width:180px;
 	height:auto;
 }
 .social-menu ul {
@@ -2425,7 +2428,7 @@ margin-bottom:10px;
 	margin-left:20px;
 }
 .social-menu-title{
-	width:150px;
+	width:180px;
 	float:left;
 	height:auto;
 	background-color:#32578b;
@@ -2489,6 +2492,15 @@ margin-bottom:10px;
 	margin:20px;
 }
 
+
+.social-menu-group-member {
+	float:left;
+	height:120px;
+	margin:5px;
+	overflow:hidden;
+	padding:2px;
+	width:76px;
+}
  
 /* SOCIAL BOX */
 
@@ -2511,7 +2523,7 @@ margin-bottom:10px;
 .social-box-container1 {
 	width:350px;
 	height:auto;
-	margin-top:20px;
+	margin-top:10px;
 }
 .social-box-content1 {
 	width:330px;
@@ -2615,6 +2627,16 @@ margin-bottom:10px;
 #social-content-online {
 	background-color:#32578B;
 	margin-bottom:5px;
+	margin-top:2px;
+	padding:1px;
+}
+
+#social-group-details {
+	margin-left:82px;
+}
+.social-group-details-info span {
+	color:#777;
+
 }
 
 
@@ -2751,10 +2773,10 @@ div#friend-container {
 }
 div.image_friend_network {
 	float:left;
-	border:1px solid #CCCCCC;
+	border:1px dotted #ccc;
 	margin:2px;
 	padding:4px;
-	background: #EFEFEF;
+	/* background: #EFEFEF; */
 	height:125px;
 	width:81px;
 	z-index:5;
@@ -3182,10 +3204,14 @@ a.read {
 
 /* home group boxes */
 
+.home_group_grid_container {
+	margin-bottom:60px;
+}
+
 .home_group_grid_element_1 {
 	font-family:Verdana, Geneva, sans-serif;
 	font-size:12px;
-	color:#666699;
+	color:#686868;
 	font-weight:bold;
 	margin:2px;
 	padding:2px;

+ 10 - 4
main/inc/lib/group_portal_manager.lib.php

@@ -926,7 +926,7 @@ class GroupPortalManager
 				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends'), array('hspace'=>'6')).'<span class="'.($show=='invite_friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('InviteFriends').'</span></a></li>';				
 				break;
 			default:
-				echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
+				echo '<li><a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('JoinGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('JoinGroup').'</a></span></li>';
 			break;
 		}
 		echo '</ul>';
@@ -950,10 +950,13 @@ class GroupPortalManager
 							$icon= '';
 						}
 						$image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);				
-						$picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);					
+						$picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
+					
+						echo '<div class="social-menu-group-member">';
 						echo '<a href="profile.php?u='.$member['user_id'].'">';
 						echo '<img height="44" border="2" align="middle" width="44" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
 						echo '<div>'.api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon.'</div></a>';
+						echo '</div>';
 						$i++;
 					}				
 				}			
@@ -961,9 +964,11 @@ class GroupPortalManager
 					//More link
 					echo '<div class="group_member_more" style="margin-top:20px;"><a href="group_members.php?id='.$group_id.'">'.get_lang('SeeMore').'</a></div>';
 				}			
-			echo '</div>';		
+			echo '</div>';	
+			echo '<div class="clear"></div>';
 			echo '<br />';
 		}
+		/*
 		// my other groups								
 		if (count($groups_by_user) > 1) {												
 			echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.get_lang('MyOtherGroups').'</span></div>';
@@ -988,7 +993,8 @@ class GroupPortalManager
 					echo '<div class="mygroups_more" style="margin-top:20px;"><a href="groups.php?view=mygroups">'.get_lang('SeeMore').'</a></div>';
 				}			
 			echo '</div>';				
-		}			
+		}		
+		*/	
 	}
 }
 ?>

+ 6 - 4
main/inc/lib/online.inc.php

@@ -136,8 +136,8 @@ function WhoIsOnline($valid, $friends = false)
 		// 	who friends from social network is online	
 		$query = "	SELECT distinct login_user_id,login_date 
 					FROM $track_online_table 
-					INNER JOIN $friend_user_table ON friend_user_id = login_user_id AND relation_type=3
-					WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' ";
+					INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
+					WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."'  AND relation_type=3 AND user_id = '".api_get_user_id()."' ";
 	} else {
 		// all users online
 		$query = "SELECT login_user_id,login_date FROM ".$track_online_table ." WHERE DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."'  ";	
@@ -153,8 +153,8 @@ function WhoIsOnline($valid, $friends = false)
 				$query = "	SELECT distinct login_user_id,login_date 
 							FROM $track_online_table 
 							INNER JOIN $tbl_user_rel_access_url user_rel_url ON (user_rel_url.user_id = track.login_user_id)		
-							INNER JOIN $friend_user_table ON friend_user_id = login_user_id AND relation_type=3
-							WHERE access_url_id =  $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' ";
+							INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
+							WHERE access_url_id =  $access_url_id AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' AND relation_type=3 AND user_id = '".api_get_user_id()."' ";
 			} else {
 				// all users online
 				$query = "	SELECT login_user_id,login_date FROM ".$track_online_table ." track
@@ -197,6 +197,8 @@ function WhoIsOnline($valid, $friends = false)
 	}
 }
 
+
+
 /**
  * Gets the full user name for a given user ID
  * @param   int User ID

+ 76 - 62
main/inc/lib/social.lib.php

@@ -640,10 +640,19 @@ class SocialManager extends UserManager {
 		return $output;
 	}
 	
+	/**
+	 * Shows the right menu of the Social Network tool
+	 * 
+	 * @param string highlight link possible values: group_add, home, messages, messages_inbox, messages_compose ,messages_outbox ,invitations, shared_profile, friends, groups search
+	 * @param int group id
+	 * @param int user id
+	 * @param bool show profile or not (show or hide the user image/information)
+	 * 
+	 */
 	public static function show_social_menu($show = '',$group_id = 0, $user_id = 0, $show_full_profile = false) {
 		
-		$img_array= UserManager::get_user_picture_path_by_id($user_id,'web',true,true);
-		$big_image =  UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG);
+		$img_array = UserManager::get_user_picture_path_by_id($user_id,'web',true,true);
+		$big_image = UserManager::get_picture_user($user_id, $img_array['file'],'',USER_IMAGE_SIZE_BIG);
 		$big_image = $big_image['file'].$big_image['dir'];
 		$show_groups = array('groups', 'group_messages', 'messages_list', 'group_add', 'mygroups', 'group_edit', 'member_list', 'invite_friends', 'waiting_list');
 		$show_messages = array('messages', 'messages_inbox', 'messages_outbox', 'messages_compose');
@@ -658,30 +667,34 @@ class SocialManager extends UserManager {
 			}
 		}
 		
-		echo '<div class="social-menu" >';		
-		if ($show != 'shared_profile') {			            	        	        	        
+		echo '<div class="social-menu">';
+				
+				
+		if ($show != 'shared_profile') {
+			
+			echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';        
+		    
+		                	        	        	        
 	        echo 	'<div>
 	                	<ul>
 	                    	<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="'.($show=='home'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Home').'</span></a></li>
 	                        <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="'.($show=='messages'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Messages').'</span></a></li>';
 	                        
-			if (in_array($show,$show_messages)) {
+			if (in_array($show, $show_messages)) {
 				
 					echo '<li><ul>';
 						echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Inbox').'</span></a></li>';
 						echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
 						echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Outbox').'</span></a></li>';
-					echo '</ul></li>';
-					
+					echo '</ul></li>';					
 				}
 	        
 	        if ($show == 'invitations') {
-	        	echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Invitations').'</span></a></li>';
-	        	
-	        } 
+	        	echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail.png',get_lang('Invitations'),array('hspace'=>'6')).'<span class="'.($show=='invitations'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Invitations').'</span></a></li>';	        	
+	        }
 	                     
 	        echo	'<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6')).'<span class="'.($show=='shared_profile'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ViewMySharedProfile').'</span></a></li>
-	        			<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="'.($show=='friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Friends').'</span></a></li>
+	        			<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('members.gif',get_lang('Friends'),array('hspace'=>'6')).'<span class="'.($show=='friends'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Friends').'</span></a></li>
 	                    <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="'.($show=='groups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Groups').'</span></a></li>';
 	                    	        
 	        if (in_array($show,$show_groups)) {
@@ -690,63 +703,64 @@ class SocialManager extends UserManager {
 						echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyGroups').'</span></a></li>';												
 					echo '</ul></li>';
 				}                                        	
-	                        echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Search').'</span></a></li>
+	                     echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Search').'</span></a></li>
 	                    </ul>
-	                </div>'; 	        
-	        if (in_array($show,$show_groups) && !empty($group_id)) {
+	                </div>'; 	 
+	                     
+	        if (in_array($show, $show_groups) && !empty($group_id)) {
 	        	echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id(), $show);
 	        }
 		}
 
         if ($show == 'shared_profile') {
         	       	        	                	
-	        	//--- User image	        	
-				echo '<div class="social-content-image">';
-					echo '<div class="social-background-content" style="width:80%;" ><center>';
-						if ($img_array['file'] != 'unknown.jpg') {
-			    	  		echo '<a class="thickbox" href="'.$big_image.'"><img src='.$img_array['dir'].$img_array['file'].' width="150px" /> </a>';
-						} else {
-							echo '<img src='.$img_array['dir'].$img_array['file'].' width="150px"/>';
-						}
-		    	  	echo '</center></div>';
-	    	  	echo '</div>';
-	    	  	
-	    	  	if ($user_id != intval(api_get_user_id())) {
-        			$user_info = api_get_user_info($user_id);        			
-        			echo '<div><center><strong>'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</strong></center></div><br />';        			
-				}    
-				
-	    	  	
-	    	  	if ($show_full_profile && $user_id == intval(api_get_user_id())) { 	  	   	  	        	
-		        	echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></div>';        
-		        	echo 	'<div>
-		                	<ul>
-		                     <li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Home').'</span></a></li>
-		                     <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Messages').'</span></a></li>';
-		        	echo	'<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="social-menu-text-active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
-		        			 <li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('lp_users.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Friends').'</span></a></li>
-		                     <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Groups').'</span></a></li>';
-		            echo   '</ul></div>';
-	    	  	}
-	    	  	
-	    	   
-	    	  	
-	    	  	$html_actions = '';
-		  		if ($user_id != api_get_user_id()) {
-		  			$html_actions =  '&nbsp;<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
-		  			$html_actions .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';	  		
-		  		}	  		
-		  		//check if I already sent an invitation message
-		  		$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
-		  			  		
-		  		if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) {  	  		
-		  			$html_actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('YouAlreadySentAnInvitation').'</a>';
-		  		} else {
-		  			if (!$show_full_profile) {
-		  				$html_actions .=  '&nbsp;<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a>';
-		  			}
-		  		}
-		  		echo $html_actions;
+        	//--- User image	        	
+			echo '<div class="social-content-image">';
+				echo '<div class="social-background-content" style="width:80%;" ><center>';
+					if ($img_array['file'] != 'unknown.jpg') {
+		    	  		echo '<a class="thickbox" href="'.$big_image.'"><img src='.$img_array['dir'].$img_array['file'].' width="180px" /> </a>';
+					} else {
+						echo '<img src='.$img_array['dir'].$img_array['file'].' width="150px"/>';
+					}
+	    	  	echo '</center></div>';
+    	  	echo '</div>';
+    	  	
+    	  	if ($user_id != intval(api_get_user_id())) {
+    			$user_info = api_get_user_info($user_id);        			
+    			echo '<div><center><strong>'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'</strong></center></div><br />';        			
+			}    
+			
+    	  	
+    	  	if ($show_full_profile && $user_id == intval(api_get_user_id())) { 	  	   	  	        	
+	        	echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';        
+	        	echo 	'<div>
+	                	<ul>
+	                     <li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.gif',get_lang('Home'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Home').'</span></a></li>
+	                     <li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Messages').'</span></a></li>';
+	        	echo	'<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="social-menu-text-active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
+	        			 <li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('members.gif',get_lang('Friends'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Friends').'</span></a></li>
+	                     <li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Groups').'</span></a></li>';
+	            echo   '</ul></div>';
+    	  	}
+    	  	
+    	   
+    	  	
+    	  	$html_actions = '';
+	  		if ($user_id != api_get_user_id()) {
+	  			$html_actions =  '&nbsp;<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
+	  			$html_actions .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a><br />';	  		
+	  		}	  		
+	  		//check if I already sent an invitation message
+	  		$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
+	  			  		
+	  		if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) {  	  		
+	  			$html_actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('YouAlreadySentAnInvitation').'</a>';
+	  		} else {
+	  			if (!$show_full_profile) {
+	  				$html_actions .=  '&nbsp;<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a>';
+	  			}
+	  		}
+	  		echo $html_actions;
 
         	/*
         	// ---- My Agenda Items
@@ -793,7 +807,7 @@ class SocialManager extends UserManager {
 	    	  		}
 	    	  	}
 	    	  	if (!empty($announcements)) {
-			    	echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.strtoupper(get_lang('Announcement')).'</span></div>';
+			    	echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Announcement').'</span></div>';
 					echo '<div>';
 					echo '<ul>';  	
 						foreach ($announcements as $announcement) {

+ 0 - 11
main/messages/inbox.php

@@ -136,17 +136,6 @@ Display::display_header('');
 $social_parameter = '';
 
 if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') {
-	$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-	$user_online_count = count($user_online_list); 
-	echo '<div class="social-header">';
-	echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-			<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-			</tr></table>';
-	/*
-	echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-	echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-	*/
-	echo '</div>';
 	$social_parameter = '?f=social';
 } else {
 	//comes from normal profile

+ 1 - 11
main/messages/new_message.php

@@ -277,17 +277,7 @@ if ($group_id != 0) {
 } else {	
 	if ($_GET['f']=='social') {
 		
-		$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-		$user_online_count = count($user_online_list); 
-		echo '<div class="social-header">';
-		echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-				<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-				</tr></table>';
-		/*
-		echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-		echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-		*/
-		echo '</div>';	
+	
 	} else {
 		echo '<div class=actions>';
 		if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {

+ 0 - 12
main/messages/outbox.php

@@ -79,18 +79,6 @@ if ($_GET['f']=='social') {
 Display::display_header('');
 
 if ($_GET['f']=='social') {
-	
-	$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-	$user_online_count = count($user_online_list); 
-	echo '<div class="social-header">';
-	echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-			<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-			</tr></table>';
-	/*
-	echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-	echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-	*/
-	echo '</div>';
 
 } else {
 	

+ 0 - 11
main/messages/view_message.php

@@ -32,17 +32,6 @@ $interbreadcrumb[]= array ('url' => '#','name' => get_lang('View'));
 Display::display_header('');
 
 if ($_GET['f']=='social') {	
-	$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-	$user_online_count = count($user_online_list); 
-	echo '<div class="social-header">';
-	echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-			<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-			</tr></table>';
-	/*
-	echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-	echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-	*/
-	echo '</div>';
 	$social_parameter = '?f=social';
 } else {
 	if (api_get_setting('extended_profile') == 'true') {

+ 0 - 12
main/social/friends.php

@@ -87,18 +87,6 @@ $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Friends'));
 
 Display :: display_header($tool_name, 'Groups');
 
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-$user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
-
 echo '<div id="social-content">';
 
 	echo '<div id="social-content-left">';	

+ 0 - 11
main/social/group_add.php

@@ -100,17 +100,6 @@ $interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
 $interbreadcrumb[]= array ('url' =>'#','name' => $nameTools);
 Display :: display_header($tool_name, 'Groups');
 
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
-$user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
 echo '<div id="social-content">';
 	echo '<div id="social-content-left">';
 		//show the action menu			

+ 0 - 8
main/social/group_edit.php

@@ -127,14 +127,6 @@ Display::display_header($tool_name);
 
 $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
 $user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
 echo '</div>';
 // Group picture
 $image_path = GroupPortalManager::get_group_picture_path_by_id($group_id,'web');

+ 1 - 11
main/social/group_invitation.php

@@ -212,17 +212,7 @@ $UserList=$SessionList=array();
 $users=$sessions=array();
 
 Display :: display_header($tool_name, 'Groups');
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
-$user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
+
 if($_POST['form_sent']) {
 	$form_sent			= $_POST['form_sent'];
 	$firstLetterUser	= $_POST['firstLetterUser'];

+ 1 - 9
main/social/group_members.php

@@ -43,15 +43,7 @@ if (empty($group_id)) {
 Display :: display_header($tool_name, 'Groups');
 $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
 $user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
+
 $show_message	= ''; 
 //if i'm a moderator
 if (isset($_GET['action']) && $_GET['action']=='add') {

+ 88 - 71
main/social/groups.php

@@ -100,6 +100,7 @@ jQuery(document).ready(function() {
 
 $allowed_views = array('mygroups','newest','pop');		   	
 $interbreadcrumb[]= array ('url' =>'home.php','name' => get_lang('Social'));
+
 if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 	if ($_GET['view'] == 'mygroups') {
 		$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
@@ -112,7 +113,7 @@ if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 		$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Popular'));
 	} 	
 } else {
-	$interbreadcrumb[]= array ('url' =>'groups','name' => get_lang('Groups'));
+	$interbreadcrumb[]= array ('url' =>'groups.php','name' => get_lang('Groups'));
 	$interbreadcrumb[]= array ('url' =>'#','name' => get_lang('MessageList'));	
 }
 
@@ -145,17 +146,37 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
 // getting group information
 $group_id	= intval($_GET['id']);
 $relation_group_title = '';
-$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'),true));
 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
+if ($group_id != 0 ) {	
+	$user_leave_message = false;
+	$user_added_group_message = false;
+	$group_info = GroupPortalManager::get_group_data($group_id);
+
+	if (isset($_GET['action']) && $_GET['action']=='leave') {
+		$user_leaved = intval($_GET['u']);
+		//I can "leave me myself"
+		if (api_get_user_id() == $user_leaved) {
+			GroupPortalManager::delete_user_rel_group($user_leaved, $group_id);
+			$user_leave_message = true;
+			
+		}	
+	}	
+	// add a user to a group if its open	
+	if (isset($_GET['action']) && $_GET['action']=='join') {
+		// we add a user only if is a open group
+		$user_join = intval($_GET['u']);	
+		if (api_get_user_id() == $user_join && !empty($group_id)) {			
+			if ($group_info['visibility'] == GROUP_PERMISSION_OPEN) {
+				GroupPortalManager::add_user_to_group($user_join, $group_id);
+				$user_added_group_message = true;	
+			} else {
+				GroupPortalManager::add_user_to_group($user_join, $group_id, GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER);
+				$user_added_group_message = true;
+			}				
+		}
+	}	
+}
+
 
 echo '<div id="social-content">';
 
@@ -167,7 +188,7 @@ echo '<div id="social-content">';
 			$show_menu = 'groups';
 			if (isset($_GET['view']) && $_GET['view'] == 'mygroups') {
 				$show_menu = $_GET['view'];
-			} 	
+			}			
 			SocialManager::show_social_menu($show_menu);
 		}	
 	echo '</div>';
@@ -175,39 +196,24 @@ echo '<div id="social-content">';
 	echo '<div id="social-content-right">';
 
 if ($group_id != 0 ) {	
+	
 	$group_info = GroupPortalManager::get_group_data($group_id);
+	
 	//Loading group information
 	if (isset($_GET['status']) && $_GET['status']=='sent') {
 		Display::display_confirmation_message(get_lang('MessageHasBeenSent'), false);
 	}	
-
-	if (isset($_GET['action']) && $_GET['action']=='leave') {
-		$user_leaved = intval($_GET['u']);
-		//I can "leave me myself"
-		if (api_get_user_id() == $user_leaved) {
-			GroupPortalManager::delete_user_rel_group($user_leaved, $group_id);
-		}	
+	
+	if ($user_leave_message) {
+		Display::display_confirmation_message(get_lang('UserIsNotSubscribedToThisGroup'), false);
 	}
 	
-	// add a user to a group if its open	
-	if (isset($_GET['action']) && $_GET['action']=='join') {
-		// we add a user only if is a open group
-		$user_join = intval($_GET['u']);	
-		if (api_get_user_id() == $user_join && !empty($group_id)) {			
-			if ($group_info['visibility'] == GROUP_PERMISSION_OPEN) {
-				GroupPortalManager::add_user_to_group($user_join, $group_id);				
-			} else {
-				GroupPortalManager::add_user_to_group($user_join, $group_id, GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER);
-			}				
-		}
+	if ($user_added_group_message) {
+		Display::display_confirmation_message(get_lang('UserIsSubscribedToThisGroup'), false);
 	}
 		
-	//-- Shows left column
-	//echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id());
-	//---
-				
 	// details about the current group
-	echo '<div class="head_group" >';
+	echo '<div class="head_group">';
 		echo '<div id="group_image" style="float:left;height:110px">';
 				$picture	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
 				$big_image	= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],'','big_');	
@@ -217,26 +223,32 @@ if ($group_id != 0 ) {
 					echo '<img src='.$picture['file'].' class="social-groups-image" /><br /><br />';
 				}		
 		echo '</div>';
-		echo '<div id="group_details" style="margin-left:105px">';
+		
+		echo '<div id="social-group-details">';
 				//Group's title
-				echo '<strong><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></strong>';
-				
-				if (!empty($relation_group_title)) {
-					echo '<br />('.$relation_group_title.')<br />';	
-				}
-			 
+				echo '<h2><a href="groups.php?id='.$group_id.'">'.$group_info['name'].'</a></h2>';
+							 
 				//Group's description 
-				echo '<div id="group_description">'.$group_info['description'].'</div>';
-				echo '<div id="group-url"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
+				echo '<div class="social-group-details-info">'.$group_info['description'].'</div>';
+				echo '<div class="social-group-details-info"><a target="_blank" href="'.$group_info['url'].'">'.$group_info['url'].'</a></div>';
 				//Privacy
-				echo '<div id="group_privacy">';
-				echo get_lang('Privacy').' : ';
-				if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
-				echo get_lang('ThisIsAnOpenGroup');
-				} elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
-				echo get_lang('ThisIsACloseGroup');
-				}
+				echo '<div class="social-group-details-info">';
+					echo '<span>'.get_lang('Privacy').' : </span>';
+					if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
+						echo get_lang('ThisIsAnOpenGroup');
+					} elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
+						echo get_lang('ThisIsACloseGroup');
+					}
 				echo '</div>';
+				
+				if (!empty($relation_group_title)) {				
+					echo '<div class="social-group-details-info">';
+					echo '<span>'.get_lang('GroupUserStatus').' : </span>';
+					echo $relation_group_title;
+					echo '</div>';
+				}
+				
+				
 				//Group's tags
 				if (!empty($tags)) {
 					echo '<div id="group_tags">'.get_lang('Tags').' : '.$tags.'</div>';
@@ -247,16 +259,18 @@ if ($group_id != 0 ) {
 	
 	//-- Show message groups
 	echo '<div class="messages">';
-	echo '<h2>'.get_lang('Topics').'</h2>';
+	echo '<h3>'.get_lang('Topics').'</h3>';
 		if (GroupPortalManager::is_group_member($group_id)) {
 			$content = MessageManager::display_messages_for_group($group_id);				
 			if (!empty($content)) {
 				echo $content;				
 			} else {
-				echo get_lang('YouShouldCreateATopic');	
+				//echo get_lang('YouShouldCreateATopic');	
+				echo '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="thickbox" title="'.get_lang('ComposeMessage').'">'.Display::return_icon('message_new.png', get_lang('NewTopic'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouShouldCreateATopic').'</span></a></li>';				
 			}
 		} else {
-			echo get_lang('YouShouldJoinTheGroup');
+			//echo get_lang('YouShouldJoinTheGroup');
+			echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('addd.gif', get_lang('YouShouldJoinTheGroup'), array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('YouShouldJoinTheGroup').'</a></span>';
 		}
 	echo '</div>'; // end layout messages
 	
@@ -287,7 +301,7 @@ if ($group_id != 0 ) {
 				$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);							
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';			
 				$grid_item_1 = Display::return_icon('boxmygroups.jpg');						
-				$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
+				$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg','').'</div>';
 				$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('GroupDescription').'</span></div>';
 				$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';	
 				$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';			
@@ -314,7 +328,7 @@ if ($group_id != 0 ) {
 			$picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80);							
 			$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';									
 			$grid_item_1 = Display::return_icon('boxmygroups.jpg');						
-			$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
+			$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg','').'</div>';
 			$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('GroupDescription').'</span></div>';
 			$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';	
 			$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';			
@@ -356,21 +370,24 @@ if ($group_id != 0 ) {
 		   	if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
 		   		$view_group = $_GET['view'];
 		   		switch ($view_group) {
-		   			case 'mygroups' :	echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';                  
-		        						if (count($grid_my_groups) > 0) {
-		        							Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
-		        						}
-		        						break;
-		        	case 'newest' :		if (count($grid_newest_groups) > 0) {
-											echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Newest')).'</div>';				
-											Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
-										}
-		        						break;
-		        	default 		:	if (count($grid_pop_groups) > 0) {
-											echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
-											Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
-										}
-		        						break;					 
+		   			case 'mygroups' :	
+		   				echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';                  
+		        		if (count($grid_my_groups) > 0) {
+		        			Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
+		        		}
+		        		break;
+		        	case 'newest' :		
+		        		if (count($grid_newest_groups) > 0) {
+							echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Newest')).'</div>';				
+							Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));		
+						}
+		        		break;
+		        	default :	
+		        		if (count($grid_pop_groups) > 0) {
+							echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
+							Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
+						}
+		        		break;					 
 		   		}		   		
 		   	} else {
 		   		echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';                  

+ 23 - 27
main/social/home.php

@@ -54,21 +54,9 @@ if (api_get_setting('profile', 'picture') == 'true') {
 
 Display :: display_header(null);
 $user_info = UserManager :: get_user_info_by_id(api_get_user_id());
-//$user_info = api_get_user_info(api_get_user_id());
 $user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
 $user_online_count = count($user_online_list); 
 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
-	
-
 echo '<div id="social-content">';
 
 	echo '<div id="social-content-left">';	
@@ -79,17 +67,21 @@ echo '<div id="social-content">';
 		echo '<div class="social-box-main1">';
 			echo '<div class="social-box-left">';
 						
-			$user_image_array = UserManager::get_picture_user(api_get_user_id(), $user_info['picture_uri'], 400, USER_IMAGE_SIZE_BIG);				
+			$user_image_array = UserManager::get_picture_user(api_get_user_id(), $user_info['picture_uri'], 400, USER_IMAGE_SIZE_ORIGINAL);
+			// info not neccesary
+			//<div><p><strong>'.get_lang('Username').'</strong><br /><span class="social-groups-text4">'.$user_info['username'].'</span></p></div>
+			//<div><p><strong>'.get_lang('Phone').'</strong><br /><span class="social-groups-text4">'.($user_info['phone']?$user_info['phone']:'').'</span></p></div>
+							
 			// information current user			
 			echo	'<div class="social-box-container1">
                     	<div>'.Display::return_icon('boxmygroups.jpg').'</div>
                         <div class="social-box-content1">
-                        	<div><img hspace="6" height="90" align="left" width="80" src="'.$user_image_array['dir'].$user_image_array['file'].'"/><p class="groupTex3"><strong>'.get_lang('Information').'</strong></p></div>                        	
-                            <div><p><strong>'.get_lang('Username').'</strong><br /><span class="social-groups-text4">'.$user_info['username'].'</span></p></div>
+                        	<div><img hspace="6" height="90" align="left" width="80" src="'.$user_image_array['dir'].$user_image_array['file'].'"/></div>                        	
+                            
                             <div><p><strong>'.get_lang('Name').'</strong><br /><span class="social-groups-text4">'.api_get_person_name($user_info['firstname'], $user_info['lastname']).'</span></p></div>
                             <div><p><strong>'.get_lang('Email').'</strong><br /><span class="social-groups-text4">'.($user_info['email']?$user_info['email']:'').'</span></p></div>
-                            <div><p><strong>'.get_lang('Phone').'</strong><br /><span class="social-groups-text4">'.($user_info['phone']?$user_info['phone']:'').'</span></p></div>
-                            <div class="box_description_group_actions" ><a href="profile.php">'.get_lang('SeeMore').$url_close.'</a></div>	            
+                            
+                            <div class="box_description_group_actions" ><a href="'.api_get_path(WEB_PATH).'main/auth/profile.php">'.Display::return_icon('edit.gif', get_lang('EditProfile'), array('hspace'=>'6')).get_lang('EditProfile').$url_close.'</a></div>	            
                         </div>                        
 					</div>';
 			
@@ -109,22 +101,25 @@ echo '<div id="social-content">';
 			echo '</div>';
 
 			echo '<div class="social-box-right">';
-			echo '<br /><br />';
+			echo '<br />';
 			echo UserManager::get_search_form($query);
 			echo '<br />';			
-			$results = GroupPortalManager::get_groups_by_age(1,false);							
+			
+			$results = GroupPortalManager::get_groups_by_age(1,false);	
+									
 			$groups_newest = array();
 			foreach ($results as $result) {
 				$id = $result['id'];
-				$url_open  = '<a href="groups.php?id='.$id.'">';
-				$url_close = '</a>';
+				$url_open  = '<a href="groups.php?id='.$id.'"><span class="social-groups-text1">';
+				$url_close = '</span></a>';
 				$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
 				if ($count_users_group == 1 ) {
 					$count_users_group = $count_users_group.' '.get_lang('Member');	
 				} else {
 					$count_users_group = $count_users_group.' '.get_lang('Members');
 				}
-				$result['name'] = $url_open.ucwords(cut($result['name'],40,true)).'('.$count_users_group.') '.$url_close.'<div>'.get_lang('DescriptionGroup').'</div>';
+				
+				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).'('.$count_users_group.') '.$url_close.Display::return_icon('linegroups.jpg','').'<div>'.get_lang('DescriptionGroup').'</div>';
 				$picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80);							
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="10" height="44" border="2" align="left" width="44" />';
 				$actions = '<div class="box_description_group_actions" ><a href="groups.php?view=newest">'.get_lang('SeeMore').$url_close.'</div>';								
@@ -135,15 +130,16 @@ echo '<div id="social-content">';
 			$groups_pop = array();
 			foreach ($results as $result) {
 				$id = $result['id'];
-				$url_open  = '<a href="groups.php?id='.$id.'">';
-				$url_close = '</a>';		
+				
+				$url_open  = '<a href="groups.php?id='.$id.'"><span class="social-groups-text1">';
+				$url_close = '</span></a>';		
 				
 				if ($result['count'] == 1 ) {
 					$result['count'] = $result['count'].' '.get_lang('Member');	
 				} else {
 					$result['count'] = $result['count'].' '.get_lang('Members');
 				}
-				$result['name'] = $url_open.ucwords(cut($result['name'],40,true)).'('.$result['count'].') '.$url_close.'<div>'.get_lang('DescriptionGroup').'</div>';
+				$result['name'] = $url_open.api_ucwords(cut($result['name'],40,true)).'('.$result['count'].') '.$url_close.Display::return_icon('linegroups.jpg').'<div>'.get_lang('DescriptionGroup').'</div>';
 				$picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80);							
 				$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="10" height="44" border="2" align="left" width="44" />';
 				$actions = '<div class="box_description_group_actions" ><a href="groups.php?view=pop">'.get_lang('SeeMore').$url_close.'</div>';								
@@ -151,13 +147,13 @@ echo '<div id="social-content">';
 			}
 			
 			if (count($groups_newest) > 0) {		
-				echo '<div class="social-groups-home-title">'.strtoupper(get_lang('Newest')).'</div>';	
+				echo '<div class="social-groups-home-title">'.api_strtoupper(get_lang('Newest')).'</div>';	
 				Display::display_sortable_grid('home_group', array(), $groups_newest, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
 				echo '<br /><br /><br />';		
 			}
 			
 			if (count($groups_pop) > 0) {
-				echo '<div class="social-groups-home-title">'.strtoupper(get_lang('Popular')).'</div>';
+				echo '<div class="social-groups-home-title">'.api_strtoupper(get_lang('Popular')).'</div>';
 				Display::display_sortable_grid('home_group', array(), $groups_pop, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
 			}
 	                               	 

+ 0 - 12
main/social/invitations.php

@@ -67,18 +67,6 @@ api_block_anonymous_users();
 
 Display :: display_header($tool_name, 'Groups');
 
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
-$user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
-
 // easy links
 if (is_array($_GET) && count($_GET)>0) {
 	foreach($_GET as $key => $value) { 

+ 3 - 5
main/social/profile.php

@@ -247,11 +247,9 @@ echo '<div id="social-content">';
 		SocialManager::show_social_menu('shared_profile', null, $user_id, $show_full_profile);
 	echo '</div>';
 
-echo '<div id="social-content-right">';	
+echo '<div id="social-content-right">';
 
-
-	echo '<div id="social-content-online">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="'.api_get_path(WEB_PATH).'whoisonline.php" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a>';
-	
+	echo '<div id="social-content-online">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="'.api_get_path(WEB_PATH).'whoisonline.php" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a>';	
 	echo '</div>';
 
 	
@@ -458,7 +456,7 @@ echo '<div id="social-content-right">';
 				$url_open  = '<a href="groups.php?id='.$id.'">';
 				$url_close = '</a>';
 				$icon = '';					
-				$name = strtoupper(cut($result['name'],20,true));				
+				$name = api_strtoupper(cut($result['name'],20,true));				
 				if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {		 	
 					$icon = Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 				} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			

+ 4 - 16
main/social/search.php

@@ -21,18 +21,6 @@ $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));
 
 Display :: display_header($tool_name);
 
-$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
-$user_online_count = count($user_online_list); 
-echo '<div class="social-header">';
-echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
-		<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
-		</tr></table>';
-/*
-echo '<div class="social-menu-title" align="center"><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
-*/
-echo '</div>';
-
 echo '<div id="social-content">';
 	echo '<div id="social-content-left">';
 		//show the action menu			
@@ -84,7 +72,7 @@ echo '<div id="social-content">';
 						$url_open  = '<a href="groups.php?id='.$id.'">';
 						$url_close = '</a>';
 						
-						$name = strtoupper(cut($result['name'],25,true));				
+						$name = api_strtoupper(cut($result['name'],25,true));				
 						if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {		 	
 							$name .= Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
 						} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
@@ -101,7 +89,7 @@ echo '<div id="social-content">';
 						$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';			
 						$grid_item_1 = Display::return_icon('boxmygroups.jpg');						
 						$item_1 = '<div>'.$url_open.$result['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
-						$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.strtoupper(get_lang('DescriptionGroup')).'</span></div>';
+						$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.api_strtoupper(get_lang('DescriptionGroup')).'</span></div>';
 						$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';	
 						$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';			
 						$grid_item_2 = $item_1.$item_2.$item_3.$item_4;				
@@ -118,7 +106,7 @@ echo '<div id="social-content">';
 						$url_open  = '<a href="groups.php?id='.$id.'">';
 						$url_close = '</a>';
 						
-						$name = strtoupper(cut($group['name'],25,true));
+						$name = api_strtoupper(cut($group['name'],25,true));
 						$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
 						if ($count_users_group == 1 ) {
 							$count_users_group = $count_users_group.' '.get_lang('Member');	
@@ -130,7 +118,7 @@ echo '<div id="social-content">';
 						$group['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';			
 						$grid_item_1 = Display::return_icon('boxmygroups.jpg');						
 						$item_1 = '<div>'.$url_open.$group['picture_uri'].'<p class="social-groups-text1"><strong>'.$name.'<br />('.$count_users_group.')</strong></p>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
-						$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.strtoupper(get_lang('DescriptionGroup')).'</span></div>';
+						$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.api_strtoupper(get_lang('DescriptionGroup')).'</span></div>';
 						$item_3 = '<div class="box_description_group_content" >'.cut($group['description'],100,true).'</div>';
 						$item_4 = '<div class="box_description_group_tags" >'.$tags.'</div>';	
 						$item_5 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';			

+ 7 - 0
user_portal.php

@@ -1292,6 +1292,12 @@ if ($show_menu) {
 	echo '</div>';
 }
 
+
+//deleting the myprofile link
+if (api_get_setting('allow_social_tool') == true) {
+	unset($menu_navigation['myprofile']);	
+}
+
 // Main navigation section
 // tabs that are deactivated are added here
 if (!empty($menu_navigation)) {
@@ -1304,6 +1310,7 @@ if (!empty($menu_navigation)) {
 		echo '<a href="'.$navigation_info['url'].'" target="_self">'.$navigation_info['title'].'</a>';
 		echo '</li>';
 		echo "\n";
+		
 	}
 	echo '</ul>';
 	echo '</div>';