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

Fix PHP warnings.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 2148678ed9
commit 5c22af943c
3 changed files with 28 additions and 24 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. 10
      main/inc/lib/message.lib.php
  2. 41
      main/messages/new_message.php
  3. 1
      main/messages/view_message.php

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

@ -884,16 +884,20 @@ class MessageManager
$message_content .= $user_image.' '; $message_content .= $user_image.' ';
} }
$receiverUserInfo = api_get_user_info($row['user_receiver_id']);
$message_content .='<tr>'; $message_content .='<tr>';
if (api_get_setting('allow_social_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true') {
if ($source == 'outbox') { if ($source == 'outbox') {
$message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.GetFullUserName($row[2]).'</b>'; $message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
api_strtolower(get_lang('To')).'&nbsp;<b>'.$receiverUserInfo['complete_name'].'</b>';
} else { } else {
$message_content .= get_lang('From').' <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.get_lang('Me').'</b>'; $message_content .= get_lang('From').' <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
api_strtolower(get_lang('To')).'&nbsp;<b>'.get_lang('Me').'</b>';
} }
} else { } else {
if ($source == 'outbox') { if ($source == 'outbox') {
$message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.GetFullUserName($row['user_receiver_id']).'</b>'; $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.$receiverUserInfo['complete_name'].'</b>';
} else { } else {
$message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>'; $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>';
} }

41
main/messages/new_message.php
Unescape View File

@ -118,7 +118,7 @@ $nameTools = get_lang('ComposeMessage');
/** /**
* Shows the compose area + a list of users to select from. * Shows the compose area + a list of users to select from.
*/ */
function show_compose_to_any ($user_id) { function show_compose_to_any($user_id) {
$online_user_list = MessageManager::get_online_user_list($user_id); $online_user_list = MessageManager::get_online_user_list($user_id);
$default['user_list'] = 0; $default['user_list'] = 0;
$online_user_list=null; $online_user_list=null;
@ -129,26 +129,23 @@ function show_compose_to_any ($user_id) {
function show_compose_reply_to_message($message_id, $receiver_id) function show_compose_reply_to_message($message_id, $receiver_id)
{ {
$table_message = Database::get_main_table(TABLE_MESSAGE); $table_message = Database::get_main_table(TABLE_MESSAGE);
$query = "SELECT user_sender_id FROM $table_message WHERE user_receiver_id=".intval($receiver_id)." AND id='".intval($message_id)."';"; $query = "SELECT user_sender_id FROM $table_message
WHERE user_receiver_id=".intval($receiver_id)." AND id='".intval($message_id)."';";
$result = Database::query($query); $result = Database::query($query);
$row = Database::fetch_array($result,'ASSOC'); $row = Database::fetch_array($result,'ASSOC');
if (!isset($row['user_sender_id'])) { if (!isset($row['user_sender_id'])) {
$html = get_lang('InvalidMessageId'); $html = get_lang('InvalidMessageId');
return $html; return $html;
} }
$pre_html = '<div class="control-group"> $userInfo = api_get_user_info($row['user_sender_id']);
<label class="control-label">'.get_lang('SendMessageTo').': </label>
<div class="controls">';
$post = '</div></div>';
$sent_to = $pre_html.'<strong>'.GetFullUserName($row['user_sender_id']).'</strong>'.$post;
$default['users'] = array($row['user_sender_id']); $default['users'] = array($row['user_sender_id']);
$html .= manage_form($default, null, $sent_to); $html = manage_form($default, null, $userInfo['complete_name']);
return $html; return $html;
} }
function show_compose_to_user ($receiver_id) { function show_compose_to_user ($receiver_id) {
global $charset;
$html = get_lang('To').':&nbsp;<strong>'.GetFullUserName($receiver_id).'</strong>'; $html = get_lang('To').':&nbsp;<strong>'.GetFullUserName($receiver_id).'</strong>';
$default['title'] = api_xml_http_response_encode(get_lang('EnterTitle')); $default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
$default['users'] = array($receiver_id); $default['users'] = array($receiver_id);
@ -156,7 +153,8 @@ function show_compose_to_user ($receiver_id) {
return $html; return $html;
} }
function manage_form($default, $select_from_user_list = null, $sent_to = null) { function manage_form($default, $select_from_user_list = null, $sent_to = null)
{
$group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null; $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
$message_id = isset($_GET['message_id']) ? intval($_GET['message_id']) : null; $message_id = isset($_GET['message_id']) ? intval($_GET['message_id']) : null;
$param_f = isset($_GET['f']) && $_GET['f'] == 'social' ? 'social' : null; $param_f = isset($_GET['f']) && $_GET['f'] == 'social' ? 'social' : null;
@ -169,7 +167,6 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
get_lang('SendMessageTo'), get_lang('SendMessageTo'),
true, true,
array( array(
'class' => 'span4',
'id'=>'id_text_name', 'id'=>'id_text_name',
'onkeyup'=>'send_request_and_search()', 'onkeyup'=>'send_request_and_search()',
'autocomplete'=>'off' 'autocomplete'=>'off'
@ -180,7 +177,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('hidden','user_list', 0, array('id'=>'user_list')); $form->addElement('hidden','user_list', 0, array('id'=>'user_list'));
} else { } else {
if (!empty($sent_to)) { if (!empty($sent_to)) {
$form->addElement('html',$sent_to); $form->addLabel(get_lang('SendMessageTo'), $sent_to);
} }
if (empty($default['users'])) { if (empty($default['users'])) {
//fb select //fb select
@ -197,7 +194,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('hidden','parent_id',$message_id); $form->addElement('hidden','parent_id',$message_id);
} }
$form->addText('title', get_lang('Subject'), true, array('class' => 'col-md-4')); $form->addText('title', get_lang('Subject'), true);
$form->addHtmlEditor('content', get_lang('Message'), false, false, array('ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250')); $form->addHtmlEditor('content', get_lang('Message'), false, false, array('ToolbarSet' => 'Messages', 'Width' => '100%', 'Height' => '250'));
if (isset($_GET['re_id'])) { if (isset($_GET['re_id'])) {
@ -223,7 +220,7 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$form->addElement('advanced_settings','<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')'); $form->addElement('advanced_settings','<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
} }
$form->addElement('style_submit_button','compose',api_xml_http_response_encode('<i class="fa fa-paper-plane"></i> '.get_lang('SendMessage')),'class="btn-success"'); $form->addButtonSend(get_lang('SendMessage'), 'compose');
$form->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>'); $form->setRequiredNote('<span class="form_required">*</span> <small>'.get_lang('ThisFieldIsRequired').'</small>');
if (!empty($group_id) && !empty($message_id)) { if (!empty($group_id) && !empty($message_id)) {
@ -270,13 +267,15 @@ function manage_form($default, $select_from_user_list = null, $sent_to = null) {
$token = Security::get_token(); $token = Security::get_token();
$form->addElement('hidden','sec_token'); $form->addElement('hidden','sec_token');
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
$html .= $form->return_form(); $html .= $form->returnForm();
} }
return $html; return $html;
} }
$socialToolIsActive = isset($_GET['f']) && $_GET['f'] == 'social';
/* MAIN SECTION */ /* MAIN SECTION */
if ($_GET['f']=='social') { if ($socialToolIsActive) {
$this_section = SECTION_SOCIAL; $this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('SocialNetwork')); $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('SocialNetwork'));
} else { } else {
@ -288,11 +287,13 @@ $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
$social_right_content = null; $social_right_content = null;
if ($group_id != 0) { if ($group_id != 0) {
$social_right_content .= '<div class=actions>'; $social_right_content .= '<div class=actions>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php?id='.$group_id.'">'.Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>'; $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/groups.php?id='.$group_id.'">'.
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>'; Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
$social_right_content .= '</div>'; $social_right_content .= '</div>';
} else { } else {
if ($_GET['f']=='social') { if ($socialToolIsActive) {
} else { } else {
$social_right_content .= '<div class=actions>'; $social_right_content .= '<div class=actions>';
if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
@ -329,7 +330,7 @@ if (!isset($_POST['compose'])) {
} elseif(isset($_GET['send_to_user'])) { } elseif(isset($_GET['send_to_user'])) {
$social_right_content .= show_compose_to_user($_GET['send_to_user']); $social_right_content .= show_compose_to_user($_GET['send_to_user']);
} else { } else {
$social_right_content .= show_compose_to_any($_user['user_id']); $social_right_content .= show_compose_to_any(api_get_user_id());
} }
} else { } else {
$restrict = false; $restrict = false;

1
main/messages/view_message.php
Unescape View File

@ -75,7 +75,6 @@ $tpl = new Template(get_lang('View'));
SocialManager::setSocialUserBlock($tpl, $user_id, $show_menu); SocialManager::setSocialUserBlock($tpl, $user_id, $show_menu);
if (api_get_setting('allow_social_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true') {
$tpl->assign('social_avatar_block', $social_avatar_block);
$tpl->assign('social_menu_block', $social_menu_block); $tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content); $tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template('social/inbox.tpl'); $social_layout = $tpl->get_template('social/inbox.tpl');

Write Preview
Loading…
Cancel
Save