More minor corrections

main/inc/lib/group_portal_manager.lib.php

@@ -250,6 +250,9 @@ class GroupPortalManager
 				$img = '<img src="'.$picture['file'].'" />';
 				$row['picture_uri'] = $img;
 			}
+			if (empty($row['id'])) {
+				continue;
+			}
 			$array[$row['id']] = $row;
 		}
 		return $array;
@@ -273,9 +276,9 @@ class GroupPortalManager
 		}		
 		$where_relation_condition = " WHERE gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."') ";
 		$sql = "SELECT DISTINCT count(user_id) as count, g.picture_uri, g.name, g.description, g.id
-				FROM $tbl_group g
-				INNER JOIN $table_group_rel_user gu
-				ON gu.group_id = g.id $where_relation_condition ORDER BY created_on desc LIMIT $num ";
+					 FROM $tbl_group g INNER JOIN $table_group_rel_user gu ON gu.group_id = g.id 
+					 $where_relation_condition
+					 ORDER BY created_on desc LIMIT $num ";
         
 		$result=Database::query($sql);
 		$array = array();
@@ -285,6 +288,9 @@ class GroupPortalManager
 				$img = '<img src="'.$picture['file'].'" />';
 				$row['picture_uri'] = $img;
 			}
+			if (empty($row['id'])) {
+				continue;
+			}
 			$array[$row['id']] = $row;
 		}
 		return $array;
@@ -571,7 +577,7 @@ class GroupPortalManager
 	    	$direction = 'ASC';
 	    }
 
-	    $column = intval($column);
+	    //$column = intval($column);
 	    $from = intval($from);
 	    $number_of_items = intval($number_of_items);
 

main/inc/lib/social.lib.php

@@ -350,8 +350,9 @@ class SocialManager extends UserManager {
 	    $feeds = array();
 	    $feed = UserManager::get_extra_user_data_by_field($user,'rssfeeds');
 	    if(empty($feed)) { return ''; }
-	    $feeds = split(';',$feed['rssfeeds']);
+	    $feeds = explode(';',$feed['rssfeeds']);
 	    if (count($feeds)==0) { return ''; }
+	    $res = '';
 	    foreach ($feeds as $url) {
 			if (empty($url)) { continue; }
 	        $rss = @fetch_rss($url);

main/inc/lib/usermanager.lib.php

@@ -2792,7 +2792,7 @@ class UserManager
 	    	$direction = 'ASC';
 	    }
 
-	    $column = intval($column);
+	    //$column = intval($column);
 	    $from = intval($from);
 	    $number_of_items = intval($number_of_items);
 

main/social/home.php

@@ -106,6 +106,7 @@ echo '<div id="social-content">';
 			
 			//Group box by age
 			$results = GroupPortalManager::get_groups_by_age(1,false);
+			
 			$groups_newest = array();
 			if (!empty($results)) {
     			foreach ($results as $result) {

main/social/search.php

@@ -22,6 +22,11 @@ $this_section = SECTION_SOCIAL;
 $tool_name 	  = get_lang('Search');
 $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social'));
 
+
+$query_vars = array();
+
+$query  = isset($_GET['q']) ? $_GET['q'] : null;
+
 Display :: display_header($tool_name);
 
 echo '<div id="social-content">';
@@ -31,11 +36,10 @@ echo '<div id="social-content">';
 	echo '</div>';
 	echo '<div id="social-content-right">';
 		
-		echo UserManager::get_search_form($_GET['q']);
+		echo UserManager::get_search_form($query);
 			
 		//I'm searching something
-		if ($_GET['q'] != '') {
-			if (isset($_GET['q']) && $_GET['q']!='') {		
+		if ($query !='') {	
 			//get users from tags
 			$users  = UserManager::get_all_user_tags($_GET['q'], 0, 0, 5);
 			$groups = GroupPortalManager::get_all_group_tags($_GET['q']);
@@ -66,7 +70,7 @@ echo '<div id="social-content">';
               
 					$user['firstname'] = Display::url($user['firstname'], $url);
 					$user['lastname'] = Display::url($user['lastname'], $url);
-										
+					$user['tag'] = isset($user['tag']) ? $user['tag'] : null;
 					$results[] = array($img, $user['firstname'], $user['lastname'], $user['tag']);			
 				}					
 					
@@ -147,7 +151,6 @@ echo '<div id="social-content">';
         			}
 					$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>';			
-				
 					$grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4.$item_5;
         			$grid_groups[]= array('',$grid_item_2);
 				}		
@@ -155,7 +158,7 @@ echo '<div id="social-content">';
 			$visibility = array(true,true,true,true,true);
 			Display::display_sortable_grid('mygroups', array(), $grid_groups, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false, $visibility);
 		}		
-		}					
+							
 	echo '</div>';
 echo '</div>';
 Display :: display_footer();