Fixed - hide waiting list option when group is open and search users and groups - partial CT#190

main/inc/lib/group_portal_manager.lib.php

@@ -1065,8 +1065,7 @@ class GroupPortalManager
 		
 		$tags		= GroupPortalManager::get_group_tags($group_id, true);
 		$members	= GroupPortalManager::get_users_by_group($group_id, true);
-		
-		
+
 		//my relation with the group is set here
 		$my_group_role = self::get_user_group_role($user_id, $group_id);
 		
@@ -1144,7 +1143,10 @@ class GroupPortalManager
 				echo '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('notebook.gif', get_lang('MessageList')).'&nbsp;'.get_lang('MessageList').'</a></li>';	
 				echo '<li><a href="group_edit.php?id='.$group_id.'">'.			Display::return_icon('edit.gif', get_lang('EditGroup')).'&nbsp;'.get_lang('EditGroup').'</a></li>';
 				echo '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('coachs.gif', get_lang('MemberList')).'&nbsp;'.get_lang('MemberList').'</a></li>';
-				echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
+								
+				if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {				
+					echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
+				}				
 				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends')).'&nbsp;'.get_lang('InviteFriends').'</a></li>';
 				
 				break;
@@ -1160,7 +1162,10 @@ class GroupPortalManager
 				
 				echo '<li><a href="groups.php?id='.$group_id.'">'.				Display::return_icon('notebook.gif', get_lang('MessageList')).'&nbsp;'.get_lang('MessageList').'</a></li>';							
 				echo '<li><a href="group_members.php?id='.$group_id.'">'.		Display::return_icon('coachs.gif', get_lang('MemberList')).'&nbsp;'.get_lang('MemberList').'</a></li>';
-				echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
+				
+				if ($group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
+					echo '<li><a href="group_waiting_list.php?id='.$group_id.'">'.	Display::return_icon('group_na.gif', get_lang('WaitingList')).'&nbsp;'.get_lang('WaitingList').'</a></li>';
+				}				
 				echo '<li><a href="group_invitation.php?id='.$group_id.'">'.	Display::return_icon('login_as.gif', get_lang('InviteFriends')).'&nbsp;'.get_lang('InviteFriends').'</a></li>';
 				
 				break;

main/inc/lib/usermanager.lib.php

@@ -2617,7 +2617,7 @@ class UserManager
 				$keyword = Database::escape_string($keyword);
 				//OR u.official_code LIKE '%".$keyword."%' 
 				// OR u.email LIKE '%".$keyword."%'
-				$sql .= " WHERE (u.firstname LIKE '%".$keyword."%' OR u.lastname LIKE '%".$keyword."%'  OR u.username LIKE '%".$keyword."%'  )";
+				$sql .= " WHERE (u.firstname LIKE '%".$keyword."%' OR u.lastname LIKE '%".$keyword."%'  OR u.username LIKE '%".$keyword."%' OR concat(u.firstname,' ',u.lastname) LIKE '%".$keyword."%' OR concat(u.lastname,' ',u.firstname) LIKE '%".$keyword."%' )";
 			}
 		$keyword_active = true;
 		//only active users

main/social/search.php

@@ -41,27 +41,32 @@ if ($query != '') {
 	if (isset($query) && $query!='') {		
 		//get users from tags
 		$users = UserManager::get_all_user_tags($query, 0, 0, 5);	
+		$groups = GroupPortalManager::get_all_group_tags($query);
+		
+		if (empty($users) && empty($groups)) {
+			echo get_lang('SorryNoResults');	
+		}
 				
 		$results = array();
 		if (is_array($users) && count($users)> 0) {
-			echo '<h2>'.get_lang('Users').'</h2>';
-			
+			echo '<h2>'.get_lang('Users').'</h2>';			
 			foreach($users as $user) {
 				$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],80);
 				$url_open = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'].'">';
 				$url_close ='</a>';
 				$img = $url_open.'<img src="'.$picture['file'].'" />'.$url_close;
 				$user['firstname'] = $url_open.$user['firstname'].$url_close;
+				$user['lastname'] = $url_open.$user['lastname'].$url_close;
 				
 				$results[] = array($img, $user['firstname'],$user['lastname'],$user['tag']);			
 			}		
-		} else {
-			echo get_lang('SorryNoResults');
-		}
+		}		
 		Display::display_sortable_grid('search_user', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
 		
 		//get users from tags
-		$groups = GroupPortalManager::get_all_group_tags($query);
+		
+		
+				
 		$results = array();
 		if (is_array($groups) && count($groups)>0) {
 			echo '<h2>'.get_lang('Groups').'</h2>';
@@ -74,7 +79,8 @@ if ($query != '') {
 				$results[] = array($img, $group['name'],$group['description'],$tags);			
 			}		
 		}		
-		Display::display_sortable_grid('search_group', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars,  false, array(true,true,true,true,true));			    
+		Display::display_sortable_grid('search_group', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars,  false, array(true,true,true,true,true));
+					    
 	}		
 } else {
 	//we should show something