From ca95db410311a4b99d7608b892305d6fab53d23e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 16 Sep 2014 12:47:20 +0200 Subject: [PATCH] Minor format code. --- main/messages/inbox.php | 10 ++++------ main/messages/index.php | 7 ++----- main/messages/new_message.php | 11 ++++------- main/messages/outbox.php | 9 +-------- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/main/messages/inbox.php b/main/messages/inbox.php index e913b8cee9..fd4cb5db2c 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -1,12 +1,9 @@ '.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).''; @@ -177,4 +175,4 @@ if (api_get_setting('allow_social_tool') == 'true') { $tpl->assign('message', $show_message); $tpl->assign('content', $content); $tpl->display_one_col_template(); -} \ No newline at end of file +} diff --git a/main/messages/index.php b/main/messages/index.php index 5a1f898d47..a00ea0d08b 100755 --- a/main/messages/index.php +++ b/main/messages/index.php @@ -3,13 +3,10 @@ /** * @package chamilo.messages */ -/** - * Code - */ require_once '../inc/global.inc.php'; 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'); } elseif ( api_get_setting('allow_message_tool')=='true') { header('Location:inbox.php'); } -exit; \ No newline at end of file +exit; diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 9ff0054b2c..0b6b017529 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -12,7 +12,6 @@ * - reply on message (when pressing reply when viewing a message) * - 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 $language_file= array('messages', 'userInfo', 'admin'); $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.''.GetFullUserName($row['user_sender_id']).''.$post; $default['users'] = array($row['user_sender_id']); $html .= manage_form($default, null, $sent_to); + 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')); } -//Display::display_header(get_lang('ComposeMessage')); - $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null; $social_right_content = null; if ($group_id != 0) { @@ -304,8 +302,7 @@ if ($group_id != 0) { } } - -//LEFT COLUMN +// LEFT COLUMN $social_left_content = null; if (api_get_setting('allow_social_tool') == 'true') { $social_left_content = SocialManager::show_social_menu('messages'); @@ -317,7 +314,7 @@ if (api_get_setting('allow_social_tool') == 'true') { $social_right_content .= '
'; } -//MAIN CONTENT +// MAIN CONTENT if (!isset($_POST['compose'])) { if(isset($_GET['re_id'])) { $social_right_content .= show_compose_reply_to_message($_GET['re_id'], api_get_user_id()); diff --git a/main/messages/outbox.php b/main/messages/outbox.php index d403824290..62215419c3 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -3,9 +3,7 @@ /** * @package chamilo.messages */ -/** - * Code - */ + // name of the language file that needs to be included $language_file = array('registration','messages','userInfo'); $cidReset=true; @@ -55,14 +53,9 @@ function deselect_all(formita) //--> '; - /* MAIN CODE */ - -//$nameTools = get_lang('Messages'); - -//api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox'))); if ($_GET['f']=='social') { $this_section = SECTION_SOCIAL; $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social'));