From 9e0c8288cac851df34fcaeacfeb0a541d13f5139 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 18 Jul 2011 19:04:36 +0200 Subject: [PATCH] More minor corrections --- main/inc/lib/group_portal_manager.lib.php | 16 +- main/inc/lib/social.lib.php | 3 +- main/inc/lib/usermanager.lib.php | 2 +- main/social/home.php | 1 + main/social/search.php | 225 +++++++++++----------- 5 files changed, 129 insertions(+), 118 deletions(-) diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php index c5d39fd336..10c057c419 100755 --- a/main/inc/lib/group_portal_manager.lib.php +++ b/main/inc/lib/group_portal_manager.lib.php @@ -250,6 +250,9 @@ class GroupPortalManager $img = ''; $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 = ''; $row['picture_uri'] = $img; } + if (empty($row['id'])) { + continue; + } $array[$row['id']] = $row; } return $array; @@ -343,7 +349,7 @@ class GroupPortalManager $image_path = UserManager::get_user_picture_path_by_id($row['user_id'], 'web', false, true); $picture = UserManager::get_picture_user($row['user_id'], $image_path['file'], $image_conf['height'], $image_conf['size']); $row['image'] = ''; - } + } $array[$row['user_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); diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 3638a7a2f8..e2bd964f93 100755 --- a/main/inc/lib/social.lib.php +++ b/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); diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 27d7b89c4d..8515a26bfb 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/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); diff --git a/main/social/home.php b/main/social/home.php index d1498f063e..5bdc6ba8a7 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -106,6 +106,7 @@ echo '
'; //Group box by age $results = GroupPortalManager::get_groups_by_age(1,false); + $groups_newest = array(); if (!empty($results)) { foreach ($results as $result) { diff --git a/main/social/search.php b/main/social/search.php index 2333bd5c9e..2510cae534 100755 --- a/main/social/search.php +++ b/main/social/search.php @@ -19,9 +19,14 @@ if (api_get_setting('allow_social_tool') !='true') { } $this_section = SECTION_SOCIAL; -$tool_name = get_lang('Search'); +$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 '
'; @@ -31,131 +36,129 @@ echo '
'; echo '
'; echo '
'; - 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']!='') { - //get users from tags - $users = UserManager::get_all_user_tags($_GET['q'], 0, 0, 5); - $groups = GroupPortalManager::get_all_group_tags($_GET['q']); - - if (empty($users) && empty($groups)) { - echo get_lang('SorryNoResults'); - } + 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']); + + if (empty($users) && empty($groups)) { + echo get_lang('SorryNoResults'); + } - $results = array(); - if (is_array($users) && count($users)> 0) { - echo '

'.get_lang('Users').'

'; - foreach($users as $user) { - $url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id']; + $results = array(); + if (is_array($users) && count($users)> 0) { + echo '

'.get_lang('Users').'

'; + foreach($users as $user) { + $url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id']; - if (empty($user['picture_uri'])) { - $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg'; - $img = Display::url('', $url); - } else { - $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL ); + if (empty($user['picture_uri'])) { + $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg'; + $img = Display::url('', $url); + } else { + $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL ); - $img = ''; - $clip = 'clip_vertical'; - if ($picture['original_height'] > $picture['original_width']) { - $clip = 'clip_horizontal'; - } - $img = Display::url(Display::div(Display::div($img, array('class'=>$clip)), array('class'=>'clip-wrapper')) , $url); - } + $img = ''; + $clip = 'clip_vertical'; + if ($picture['original_height'] > $picture['original_width']) { + $clip = 'clip_horizontal'; + } + $img = Display::url(Display::div(Display::div($img, array('class'=>$clip)), array('class'=>'clip-wrapper')) , $url); + } - $user['firstname'] = Display::url($user['firstname'], $url); - $user['lastname'] = Display::url($user['lastname'], $url); - - $results[] = array($img, $user['firstname'], $user['lastname'], $user['tag']); - } + $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']); + } - echo '
'; - Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true); - echo '
'; - } + echo '
'; + Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true); + echo '
'; + } - //get users from tags - if (is_array($results) && count($results) > 0) { - foreach ($results as $result) { - $id = $result['id']; - $url_open = ''; - $url_close = ''; + //get users from tags + if (is_array($results) && count($results) > 0) { + foreach ($results as $result) { + $id = $result['id']; + $url_open = ''; + $url_close = ''; - $name = api_strtoupper(cut($result['name'],25,true)); - if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { - $name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle')); - } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { - $name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle')); - } - $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'); - } - - $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); - - $result['picture_uri'] = ''; - $grid_item_1 = Display::return_icon('boxmygroups.jpg'); - $item_1 = '
'.$url_open.$result['picture_uri'].''.$name.'
('.$count_users_group.')'.$url_close.Display::return_icon('linegroups.jpg').'
'; + $name = api_strtoupper(cut($result['name'],25,true)); + if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { + $name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle')); + } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { + $name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle')); + } + $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'); + } - if ($result['description'] != '') { - $item_2 = '
'; - $item_3 = '
'.cut($result['description'],100,true).'
'; - } else { - $item_2 = '
'; - $item_3 = '
'; - } - $item_4 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; - $grid_item_2 = $item_1.$item_2.$item_3.$item_4; - $grid_my_groups[]= array($grid_item_1,$grid_item_2); + $picture = GroupPortalManager::get_picture_group($result['id'], $result['picture_uri'],80); + + $result['picture_uri'] = ''; + $grid_item_1 = Display::return_icon('boxmygroups.jpg'); + $item_1 = '
'.$url_open.$result['picture_uri'].''.$name.'
('.$count_users_group.')'.$url_close.Display::return_icon('linegroups.jpg').'
'; + + if ($result['description'] != '') { + $item_2 = '
'; + $item_3 = '
'.cut($result['description'],100,true).'
'; + } else { + $item_2 = '
'; + $item_3 = '
'; } + $item_4 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; + $grid_item_2 = $item_1.$item_2.$item_3.$item_4; + $grid_my_groups[]= array($grid_item_1,$grid_item_2); } + } - $grid_groups = array(); - if (is_array($groups) && count($groups)>0) { - echo '

'.get_lang('Groups').'

'; - foreach($groups as $group) { - $id = $group['id']; - $url_open = ''; - $url_close = ''; - $name = 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'); - } else { - $count_users_group = $count_users_group.' '.get_lang('Members'); - } - $picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80); - $tags = GroupPortalManager::get_group_tags($group['id']); - $group['picture_uri'] = ''; - + $grid_groups = array(); + if (is_array($groups) && count($groups)>0) { + echo '

'.get_lang('Groups').'

'; + foreach($groups as $group) { + $id = $group['id']; + $url_open = ''; + $url_close = ''; + $name = 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'); + } else { + $count_users_group = $count_users_group.' '.get_lang('Members'); + } + $picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80); + $tags = GroupPortalManager::get_group_tags($group['id']); + $group['picture_uri'] = ''; + - $item_0 = Display::div($group['picture_uri'], array('class'=>'box_description_group_image')); - $members = Display::span($count_users_group, array('class'=>'box_description_group_member')); - $item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); + $item_0 = Display::div($group['picture_uri'], array('class'=>'box_description_group_image')); + $members = Display::span($count_users_group, array('class'=>'box_description_group_member')); + $item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); - $item_2 = ''; - $item_3 = ''; - if ($group['description'] != '') { - $item_3 = '
'.cut($group['description'],100,true).'
'; - } else { - $item_2 = '
'; - $item_3 = '
'; - } - $item_4 = '
'.$tags.'
'; - $item_5 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; - - $grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4.$item_5; - $grid_groups[]= array('',$grid_item_2); - } - } - $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); - } - } + $item_2 = ''; + $item_3 = ''; + if ($group['description'] != '') { + $item_3 = '
'.cut($group['description'],100,true).'
'; + } else { + $item_2 = '
'; + $item_3 = '
'; + } + $item_4 = '
'.$tags.'
'; + $item_5 = '
'.$url_open.get_lang('SeeMore').$url_close.'
'; + $grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4.$item_5; + $grid_groups[]= array('',$grid_item_2); + } + } + $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 '
'; echo '
'; Display :: display_footer(); \ No newline at end of file