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

Group improvements + message improvements see #5611

Browse Source
skala
Julio Montoya 17 years ago
parent 3c84987966
commit b79ffbe4c6
4 changed files with 29 additions and 49 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. 2
      main/inc/lib/message.lib.php
  2. 32
      tests/main/inc/lib/social.lib.test.php
  3. 21
      user_portal.php
  4. 23
      whoisonline.php

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

@ -139,7 +139,7 @@ class MessageManager
$i = 0;
$message_list = array ();
while ($result = Database::fetch_row($sql_result)) {
var_dump($result);
if ($request===true) {
$message[0] = '<input type="checkbox" value='.$result[0].' name="id[]">';
} else {

32
tests/main/inc/lib/social.lib.test.php
Unescape View File

@ -7,8 +7,6 @@ Mock::generate('Display');
Mock::generate('UserManager');
Mock::generate('MessageManager');
class TestSocial extends UnitTestCase{
/*
public $social;
@ -18,7 +16,7 @@ class TestSocial extends UnitTestCase{
}
public function setUp(){
$this->social = new UserFriend();
$this->social = new SocialManager();
}
public function tearDown(){
@ -30,7 +28,7 @@ class TestSocial extends UnitTestCase{
$friend_id=4;
$my_user_id=1;
$relation_type=2;
$res= UserFriend::register_friend ($friend_id,$my_user_id,$relation_type);
$res= SocialManager::register_friend ($friend_id,$my_user_id,$relation_type);
$instans->expectCallCount(Database);
$this->assertTrue(is_object($instans));
$this->assertTrue(is_null($res));
@ -43,7 +41,7 @@ class TestSocial extends UnitTestCase{
$instans= new MockDatabase();
$instans1= new MockDatabase();
$friend_id=4;
$res = UserFriend::removed_friend ($friend_id);
$res = SocialManager::removed_friend ($friend_id);
$instans->expectCallCount(Database,8,'' );
$instans1->expectMaximumCallCount(Database,10,'');
$this->assertTrue(is_object($instans));
@ -57,7 +55,7 @@ class TestSocial extends UnitTestCase{
public function testShowListTypeFriends(){
$instans= new MockDatabase();
$instans1= new MockDatabase();
$res =UserFriend::show_list_type_friends();
$res =SocialManager::show_list_type_friends();
$instans->expectOnce(Database);
$instans1->expectMaximumCallCount(Database,10,'');
$this->assertTrue(is_object($instans) || is_object($instans1));
@ -70,7 +68,7 @@ class TestSocial extends UnitTestCase{
public function testGetRelationTypeByName (){
$relation_type_name=1;
$res = UserFriend::get_relation_type_by_name ($relation_type_name);
$res = SocialManager::get_relation_type_by_name ($relation_type_name);
if(!is_null($res)):
$this->assertTrue(is_numeric($res));
$this->assertTrue($res);
@ -84,7 +82,7 @@ class TestSocial extends UnitTestCase{
$instans2= new MockDatabase();
$user_id=1;
$user_friend=3;
$res =UserFriend::get_relation_between_contacts ($user_id,$user_friend);
$res =SocialManager::get_relation_between_contacts ($user_id,$user_friend);
$instans->expectOnce(Database);
$instans1->expectMinimumCallCount(Database);
$instans2->expectMaximumCallCount(Database);
@ -106,7 +104,7 @@ class TestSocial extends UnitTestCase{
$user_id = 1;
$id_group=3;
$search_name='group';
$res = UserFriend::get_list_id_friends_by_user_id ($user_id,$id_group,$search_name);
$res = SocialManager::get_friends_id ($user_id,$id_group,$search_name);
$instans->expectOnce(Database);
$this->assertTrue(is_array($res));
$this->assertTrue(is_object($instans));
@ -119,7 +117,7 @@ class TestSocial extends UnitTestCase{
$user_id=1;
$id_group=null;
$search_name=null;
$res = UserFriend::get_list_path_web_by_user_id ($user_id,$id_group,$search_name);
$res = SocialManager::get_list_path_web_by_user_id ($user_id,$id_group,$search_name);
$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['friend_user_id'],'web',false,true));
if(!($res===true)):
$this->assertTrue(is_object($instans));
@ -132,7 +130,7 @@ class TestSocial extends UnitTestCase{
public function testGetListWebPathUserInvitationByUserId(){
$instans = new MockUserManager();
$user_id=1;
$res = UserFriend::get_list_web_path_user_invitation_by_user_id($user_id);
$res = SocialManager::get_list_web_path_user_invitation_by_user_id($user_id);
$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['user_sender_id'],'web',false,true));
if(is_array($res))
$this->assertTrue(is_array($res));
@ -149,7 +147,7 @@ class TestSocial extends UnitTestCase{
$friend_id=3;
$message_title='hello';
$message_content='hola';
$res = UserFriend ::send_invitation_friend ($user_id,$friend_id,$message_title,$message_content);
$res = SocialManager ::send_invitation_friend ($user_id,$friend_id,$message_title,$message_content);
$instans->expectMaximumCallCount(Database);
if(!is_null($res)):
$this->assertTrue(is_bool($res));
@ -163,7 +161,7 @@ class TestSocial extends UnitTestCase{
public function testGetMessageNumberInvitationByUserId(){
$instans = new MockDatabase();
$user_receiver_id=3;
$res = UserFriend::get_message_number_invitation_by_user_id ($user_receiver_id);
$res = SocialManager::get_message_number_invitation_by_user_id ($user_receiver_id);
$instans->expectMaximumCallCount(Database);
if(is_string($res)):
$this->assertTrue(is_numeric($res));
@ -177,7 +175,7 @@ class TestSocial extends UnitTestCase{
public function testGetListInvitationOfFriendsByUserId(){
$instans = new MockDatabase();
$user_id=1;
$res = UserFriend::get_list_invitation_of_friends_by_user_id ($user_id);
$res = SocialManager::get_list_invitation_of_friends_by_user_id ($user_id);
$instans->expectCallCount(Database,3,'');
$this->assertTrue(is_array($res));
$this->assertTrue(is_object($instans));
@ -190,7 +188,7 @@ class TestSocial extends UnitTestCase{
$instans1= new MockDatabase();
$user_send_id=1;
$user_receiver_id=3;
$res = UserFriend::invitation_accepted ($user_send_id,$user_receiver_id);
$res = SocialManager::invitation_accepted ($user_send_id,$user_receiver_id);
$instans->expectOnce(Database::get_main_table(TABLE_MAIN_MESSAGE));
$instans1->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_null($res));
@ -205,7 +203,7 @@ class TestSocial extends UnitTestCase{
$instans = new MockDatabase();
$user_send_id=1;
$user_receiver_id=3;
$res = UserFriend::invitation_denied($user_send_id,$user_receiver_id);
$res = SocialManager::invitation_denied($user_send_id,$user_receiver_id);
$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_object($instans));
$this->assertTrue(is_null($res));
@ -219,7 +217,7 @@ class TestSocial extends UnitTestCase{
$instans = new MockDatabase();
$id_friend_qualify=2;
$type_qualify=1;
$res = UserFriend::qualify_friend($id_friend_qualify,$type_qualify);
$res = SocialManager::qualify_friend($id_friend_qualify,$type_qualify);
$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_null($res));
$this->assertTrue(is_object($instans));

21
user_portal.php
Unescape View File

@ -1233,10 +1233,17 @@ if ($show_menu) {
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
// New messages
$number_of_new_messages = MessageManager::get_new_messages();
// New contact invitations
$number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id(api_get_user_id());
// New group invitations sent by a moderator
$group_pending_invitations = GroupPortalManager::get_groups_by_user(api_get_user_id(), GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,false);
$group_pending_invitations = count($group_pending_invitations);
$cant_msg = '';
if ($number_of_new_messages > 0)
$cant_msg = ' ('.$number_of_new_messages.')';
@ -1249,7 +1256,10 @@ if ($show_menu) {
if ($number_of_new_messages_of_friend > 0) {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php" class="message-body">'.get_lang('PendingInvitations').' ('.$number_of_new_messages_of_friend.') </a><br />';
}
}
if ( $group_pending_invitations > 0) {
echo '<a href="'.api_get_path(WEB_PATH).'main/social/invitations.php" class="message-body">'.get_lang('GroupPendingInvitations').' ('.$group_pending_invitations.') </a><br />';
}
echo '</p>';
//echo '<img src="'.api_get_path(WEB_IMG_PATH).'delete.gif" alt="'.get_lang('Close').'" title="'.get_lang('Close').'" class="message-delete" />';
@ -1304,19 +1314,10 @@ if (isset($_plugins['mycourses_menu']) && is_array($_plugins['mycourses_menu']))
}
if (api_get_setting('allow_reservation') == 'true' && api_is_allowed_to_create_course() ){
//include_once('main/reservation/rsys.php');
echo '<div class="menusection">';
echo '<span class="menusectioncaption">'.get_lang('Booking').'</span>';
echo '<ul class="menulist">';
echo '<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />';
//echo '<a href="main/reservation/reservation.php">'.get_lang('ManageReservations').'</a><br />';
/*require_once('main/reservation/rsys.php');
if(api_is_platform_admin() || Rsys :: check_user_status() == 1) { // Only for admins & teachers...
echo '<a href="main/reservation/m_item.php">'.get_lang('ManageItems').'</a><br />';
echo '<a href="main/reservation/m_reservation.php">'.get_lang('ManageReservationPeriods').'</a><br />';
}
*/
echo '</ul>';
echo '</div>';
}

23
whoisonline.php
Unescape View File

@ -158,27 +158,8 @@ function display_user_list($user_list, $_plugins) {
if (api_get_setting('show_email_addresses') == 'true') {
$table_header[] = array(get_lang('Email'), true);
}
//$user_anonymous = api_get_anonymous_id();
/*
if (api_get_setting('allow_social_tool') == 'true' && api_get_user_id() <> $user_anonymous && api_get_user_id() <> 0) {
$table_header[] = array(get_lang('Friends'), false, 'width="200"');
}
//this feature is deprecated
if (api_get_setting('allow_message_tool') == 'true' && isset($_SESSION['_user'])) {
$table_header[] = array(get_lang('SendMessage'), true);
}*/
//$sorting_options['column'] = (isset($_GET['column']) ? (int)$_GET['column'] : 2);
//if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
//send_invitation_friend_user();
//echo '<div align="right"><input type="button" name="id_btn_send_invitation" id="id_btn_send_invitation" value="'.get_lang('SendInviteMessage').'"/></div>';
//echo '<form action="whoisonline.php" name="form_register_friend" id="form_register_friend" method="post">';
//}
Display::display_sortable_table($table_header, $table_data, $sorting_options, array('per_page' => 30), $extra_params,array(),'grid');
//if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true' ) {
// echo '</form>';
// }
}
Display::display_sortable_table($table_header, $table_data, array(), array('per_page' => 30), $extra_params,array(),'grid');
}
}
/**

Write Preview
Loading…
Cancel
Save