Minor format code.

1.9.x
Julio Montoya 11 years ago
parent 557d45cf08
commit ca95db4103
  1. 8
      main/messages/inbox.php
  2. 3
      main/messages/index.php
  3. 11
      main/messages/new_message.php
  4. 9
      main/messages/outbox.php

@ -1,12 +1,9 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* @package chamilo.messages * @package chamilo.messages
*/ */
/**
* Code
*/
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file = array('registration', 'messages', 'userInfo'); $language_file = array('registration', 'messages', 'userInfo');
$cidReset = true; $cidReset = true;
@ -46,6 +43,7 @@ function hide_icon_edit(element_html) {
*/ */
$nameTools = get_lang('Messages'); $nameTools = get_lang('Messages');
$request = api_is_xml_http_request(); $request = api_is_xml_http_request();
$show_message = null;
if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) { if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
$info_reply = array(); $info_reply = array();
$info_delete = array(); $info_delete = array();
@ -116,7 +114,7 @@ $social_parameter = '';
if (isset($_GET['f']) && $_GET['f'] == 'social' || api_get_setting('allow_social_tool') == 'true') { if (isset($_GET['f']) && $_GET['f'] == 'social' || api_get_setting('allow_social_tool') == 'true') {
$social_parameter = '?f=social'; $social_parameter = '?f=social';
} else { } else {
$actions = null;
//Comes from normal profile //Comes from normal profile
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') {
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>'; $actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';

@ -3,9 +3,6 @@
/** /**
* @package chamilo.messages * @package chamilo.messages
*/ */
/**
* Code
*/
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
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') {
header('Location:inbox.php?f=social'); header('Location:inbox.php?f=social');

@ -12,7 +12,6 @@
* - reply on message (when pressing reply when viewing a message) * - reply on message (when pressing reply when viewing a message)
* - send to specific user (when pressing send message in the who is online list) * - send to specific user (when pressing send message in the who is online list)
*/ */
/* INIT SECTION */
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file= array('messages', 'userInfo', 'admin'); $language_file= array('messages', 'userInfo', 'admin');
$cidReset = true; $cidReset = true;
@ -83,7 +82,7 @@ function check_users() {
} }
}); });
} }
}, }
}); });
} }
}); });
@ -149,6 +148,7 @@ function show_compose_reply_to_message($message_id, $receiver_id)
$sent_to = $pre_html.'<strong>'.GetFullUserName($row['user_sender_id']).'</strong>'.$post; $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, $sent_to);
return $html; return $html;
} }
@ -279,8 +279,6 @@ if ($_GET['f']=='social') {
$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile')); $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
} }
//Display::display_header(get_lang('ComposeMessage'));
$group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null; $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) {
@ -304,8 +302,7 @@ if ($group_id != 0) {
} }
} }
// LEFT COLUMN
//LEFT COLUMN
$social_left_content = null; $social_left_content = null;
if (api_get_setting('allow_social_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true') {
$social_left_content = SocialManager::show_social_menu('messages'); $social_left_content = SocialManager::show_social_menu('messages');
@ -317,7 +314,7 @@ if (api_get_setting('allow_social_tool') == 'true') {
$social_right_content .= '<div class="span9">'; $social_right_content .= '<div class="span9">';
} }
//MAIN CONTENT // MAIN CONTENT
if (!isset($_POST['compose'])) { if (!isset($_POST['compose'])) {
if(isset($_GET['re_id'])) { if(isset($_GET['re_id'])) {
$social_right_content .= show_compose_reply_to_message($_GET['re_id'], api_get_user_id()); $social_right_content .= show_compose_reply_to_message($_GET['re_id'], api_get_user_id());

@ -3,9 +3,7 @@
/** /**
* @package chamilo.messages * @package chamilo.messages
*/ */
/**
* Code
*/
// name of the language file that needs to be included // name of the language file that needs to be included
$language_file = array('registration','messages','userInfo'); $language_file = array('registration','messages','userInfo');
$cidReset=true; $cidReset=true;
@ -55,14 +53,9 @@ function deselect_all(formita)
//--> //-->
</script>'; </script>';
/* /*
MAIN CODE MAIN CODE
*/ */
//$nameTools = get_lang('Messages');
//api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox')));
if ($_GET['f']=='social') { if ($_GET['f']=='social') {
$this_section = SECTION_SOCIAL; $this_section = SECTION_SOCIAL;
$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));

Loading…
Cancel
Save