From 494b6127092c83ee011dc27d583dd0e70631b664 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 4 May 2015 14:40:37 +0200 Subject: [PATCH] Minor - format code. --- main/inc/lib/message.lib.php | 33 +++++++++++++++++++++------------ main/messages/view_message.php | 14 +++++++++----- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 9fe6771760..f6708992f4 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -852,21 +852,28 @@ class MessageManager if ($source == 'outbox') { if (isset($message_id) && is_numeric($message_id)) { $query = "SELECT * FROM $table_message - WHERE user_sender_id=".api_get_user_id()." AND id=".$message_id." AND msg_status=4;"; + WHERE + user_sender_id = ".api_get_user_id()." AND + id = ".$message_id." AND + msg_status = 4;"; $result = Database::query($query); - $path = 'outbox.php'; } } else { if (is_numeric($message_id) && !empty($message_id)) { - $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' - WHERE user_receiver_id=".api_get_user_id()." AND id='".$message_id."';"; + $query = "UPDATE $table_message SET + msg_status = '".MESSAGE_STATUS_NEW."' + WHERE + user_receiver_id=".api_get_user_id()." AND + id='".$message_id."'"; Database::query($query); $query = "SELECT * FROM $table_message - WHERE msg_status<>4 AND user_receiver_id=".api_get_user_id()." AND id='".$message_id."';"; + WHERE + msg_status<>4 AND + user_receiver_id=".api_get_user_id()." AND + id='".$message_id."'"; $result = Database::query($query); } - $path = 'inbox.php'; } $row = Database::fetch_array($result, 'ASSOC'); $user_sender_id = $row['user_sender_id']; @@ -928,12 +935,16 @@ class MessageManager $social_link = 'f=social'; } if ($source == 'outbox') { - $message_content .= ''.Display::return_icon('back.png', get_lang('ReturnToOutbox')).'  '; + $message_content .= ''. + Display::return_icon('back.png', get_lang('ReturnToOutbox')).'  '; } else { - $message_content .= ''.Display::return_icon('back.png', get_lang('ReturnToInbox')).'  '; - $message_content .= ''.Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'  '; + $message_content .= ''. + Display::return_icon('back.png', get_lang('ReturnToInbox')).'  '; + $message_content .= ''. + Display::return_icon('message_reply.png', get_lang('ReplyToMessage')).'  '; } - $message_content .= ''.Display::return_icon('delete.png', get_lang('DeleteMessage')).' '; + $message_content .= ''. + Display::return_icon('delete.png', get_lang('DeleteMessage')).' '; $message_content .=' @@ -949,8 +960,6 @@ class MessageManager public static function show_message_box_sent() { $table_message = Database::get_main_table(TABLE_MESSAGE); - $tbl_message_attach = Database::get_main_table(TABLE_MESSAGE_ATTACHMENT); - $message_id = ''; if (is_numeric($_GET['id_send'])) { $query = "SELECT * FROM $table_message diff --git a/main/messages/view_message.php b/main/messages/view_message.php index 31525cb19d..e3088de0de 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -28,12 +28,16 @@ if (isset($_GET['f']) && $_GET['f']=='social') { $social_right_content .= '
'; if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') { - $social_right_content .= ''.Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).''; + $social_right_content .= ''. + Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).''; } if (api_get_setting('allow_message_tool') == 'true') { - $social_right_content .= ''.Display::return_icon('message_new.png',get_lang('ComposeMessage')).''; - $social_right_content .= ''.Display::return_icon('inbox.png',get_lang('Inbox')).''; - $social_right_content .= ''.Display::return_icon('outbox.png',get_lang('Outbox')).''; + $social_right_content .= ''. + Display::return_icon('message_new.png',get_lang('ComposeMessage')).''; + $social_right_content .= ''. + Display::return_icon('inbox.png',get_lang('Inbox')).''; + $social_right_content .= ''. + Display::return_icon('outbox.png',get_lang('Outbox')).''; } $social_right_content .= '
'; } @@ -59,7 +63,7 @@ if (api_get_setting('allow_social_tool') == 'true') { $message .='
'; } //MAIN CONTENT -$message .= MessageManager::show_message_box($id_message,$source); +$message .= MessageManager::show_message_box($id_message, $source); if (api_get_setting('allow_social_tool') == 'true') { $message .='
';