chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More minor corrections

Browse Source
skala
Julio Montoya 14 years ago
parent ed42f11bcd
commit 9e0c8288ca
5 changed files with 129 additions and 118 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      main/inc/lib/group_portal_manager.lib.php
  2. 3
      main/inc/lib/social.lib.php
  3. 2
      main/inc/lib/usermanager.lib.php
  4. 1
      main/social/home.php
  5. 225
      main/social/search.php

16
main/inc/lib/group_portal_manager.lib.php
Unescape View File

@ -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;
@ -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'] = '<img src="'.$picture['file'].'" '.$picture['style'].' />';
}
}
$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);

3
main/inc/lib/social.lib.php
Unescape View File

@ -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);

2
main/inc/lib/usermanager.lib.php
Unescape View File

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

1
main/social/home.php
Unescape View File

@ -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) {

225
main/social/search.php
Unescape View File

@ -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 '<div id="social-content">';
@ -31,131 +36,129 @@ 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']!='') {
//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 '<h2>'.get_lang('Users').'</h2>';
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 '<h2>'.get_lang('Users').'</h2>';
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('<img title class="social-home-anonymous-online" src="'.$picture['file'].'">', $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('<img title class="social-home-anonymous-online" src="'.$picture['file'].'">', $url);
} else {
$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL );
$img = '<img src="'.$picture['file'].'">';
$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 = '<img src="'.$picture['file'].'">';
$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 '<div id="div_content_table" class="rounded_div">';
Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
echo '</div>';
}
echo '<div id="div_content_table" class="rounded_div">';
Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
echo '</div>';
}
//get users from tags
if (is_array($results) && count($results) > 0) {
foreach ($results as $result) {
$id = $result['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
//get users from tags
if (is_array($results) && count($results) > 0) {
foreach ($results as $result) {
$id = $result['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$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'] = '<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'].'<strong>'.$name.'<br />('.$count_users_group.')</strong>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
$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 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></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;
$grid_my_groups[]= array($grid_item_1,$grid_item_2);
$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'].'<strong>'.$name.'<br />('.$count_users_group.')</strong>'.$url_close.Display::return_icon('linegroups.jpg').'</div>';
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></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;
$grid_my_groups[]= array($grid_item_1,$grid_item_2);
}
}
$grid_groups = array();
if (is_array($groups) && count($groups)>0) {
echo '<h2>'.get_lang('Groups').'</h2>';
foreach($groups as $group) {
$id = $group['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$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'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_groups = array();
if (is_array($groups) && count($groups)>0) {
echo '<h2>'.get_lang('Groups').'</h2>';
foreach($groups as $group) {
$id = $group['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$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'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$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 = '<div class="box_description_group_content" >'.cut($group['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></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>';
$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 = '<div class="box_description_group_content" >'.cut($group['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></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>';
$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 '</div>';
echo '</div>';
Display :: display_footer();
Write Preview
Loading…
Cancel
Save