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

Rename function to sendInvitationToUser, use AddFlash

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 277763de13
commit a3af85f276
3 changed files with 63 additions and 58 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/ajax/message.ajax.php
  2. 117
      main/inc/lib/social.lib.php
  3. 2
      tests/main/inc/lib/social.lib.test.php

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

@ -29,7 +29,7 @@ switch ($action) {
$subject = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : null;
$invitationContent = isset($_REQUEST['content']) ? trim($_REQUEST['content']) : null;
SocialManager::send_invitation_friend_user($_REQUEST['user_id'], $subject, $invitationContent);
SocialManager::sendInvitationToUser($_REQUEST['user_id'], $subject, $invitationContent);
break;
case 'find_users':
if (api_is_anonymous()) {

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

@ -56,6 +56,7 @@ class SocialManager extends UserManager
$list_type_friend = self::show_list_type_friends();
foreach ($list_type_friend as $value_type_friend) {
if (strtolower($value_type_friend['title']) == $relation_type_name) {
return $value_type_friend['id'];
}
}
@ -194,7 +195,7 @@ class SocialManager extends UserManager
WHERE
user_sender_id='.$user_id.' AND
user_receiver_id='.$friend_id.' AND
msg_status IN(5,6,7);
msg_status IN('.MESSAGE_STATUS_INVITATION_PENDING.', '.MESSAGE_STATUS_INVITATION_ACCEPTED.', '.MESSAGE_STATUS_INVITATION_DENIED.');
';
$res_exist = Database::query($sql);
$row_exist = Database::fetch_array($res_exist, 'ASSOC');
@ -361,61 +362,6 @@ class SocialManager extends UserManager
Database::query($sql);
}
/**
* Sends invitations to friends
* @author Isaac Flores Paz <isaac.flores.paz@gmail.com>
* @author Julio Montoya <gugli100@gmail.com> Cleaning code
* @param void
* @return string message invitation
*/
public static function send_invitation_friend_user($userfriend_id, $subject_message = '', $content_message = '')
{
global $charset;
$user_info = api_get_user_info($userfriend_id);
$succes = get_lang('MessageSentTo');
$succes.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
if (isset($subject_message) && isset($content_message) && isset($userfriend_id)) {
$send_message = MessageManager::send_message($userfriend_id, $subject_message, $content_message);
if ($send_message) {
Display::addFlash(
Display::display_confirmation_message($succes, true, true)
);
} else {
Display::addFlash(
Display::display_error_message(get_lang('ErrorSendingMessage'), true, true)
);
}
return false;
} elseif (isset($userfriend_id) && !isset($subject_message)) {
$count_is_true = false;
if (isset($userfriend_id) && $userfriend_id > 0) {
$message_title = get_lang('Invitation');
$count_is_true = self::send_invitation_friend(api_get_user_id(), $userfriend_id, $message_title, $content_message);
if ($count_is_true) {
Display::addFlash(
Display::display_confirmation_message(
api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES, $charset),
false,
true
)
);
} else {
Display::addFlash(
Display::display_warning_message(
api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES, $charset),
false,
true
)
);
}
}
}
}
/**
* Get user's feeds
* @param int User ID
@ -473,6 +419,65 @@ class SocialManager extends UserManager
return $res;
}
/**
* Sends invitations to friends
*
* @param int $userId
* @param string $subject
* @param string $content
*
* @return string message invitation
*/
public static function sendInvitationToUser($userId, $subject = '', $content = '')
{
$user_info = api_get_user_info($userId);
$success = get_lang('MessageSentTo');
$success.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
if (isset($subject) && isset($content) && isset($userId)) {
$result = MessageManager::send_message($userId, $subject, $content);
if ($result) {
Display::addFlash(
Display::return_message($success, 'normal', false)
);
} else {
Display::addFlash(
Display::return_message(get_lang('ErrorSendingMessage'), 'error', false)
);
}
return false;
} elseif (isset($userId) && !isset($subject)) {
if (isset($userId) && $userId > 0) {
$count = self::send_invitation_friend(
api_get_user_id(),
$userId,
get_lang('Invitation'),
$content
);
if ($count) {
Display::addFlash(
Display::return_message(
api_htmlentities(get_lang('InvitationHasBeenSent')),
'normal',
false
)
);
} else {
Display::addFlash(
Display::return_message(
api_htmlentities(get_lang('YouAlreadySentAnInvitation')),
'warning',
false
)
);
}
}
}
}
/**
* Helper functions definition
*/

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

@ -126,7 +126,7 @@ class TestSocial extends UnitTestCase{
$userfriend_id = 1;
$subject_message = 'test';
$content_message = 'this message is a test';
$res = SocialManager::send_invitation_friend_user ($userfriend_id,$subject_message,$content_message);
$res = SocialManager::sendInvitationToUser ($userfriend_id,$subject_message,$content_message);
ob_end_clean();
if(is_string($res)){
$this->assertTrue($res);

Write Preview
Loading…
Cancel
Save