From 319bf79c8722cf85dca81563d4ae4d5bf9ea65ec Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 14 Aug 2019 16:08:08 +0200
Subject: [PATCH] Fix redirect after deleting a message

---
 main/inc/lib/display.lib.php          |  2 +-
 main/inc/lib/message.lib.php          | 11 ++++-------
 main/inc/lib/sortable_table.class.php |  2 +-
 main/messages/outbox.php              | 16 ++++++++--------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 7ddf72f8e2..e74fbc8403 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -1804,7 +1804,7 @@ class Display
             $session = [];
             $session['category_id'] = $session_info['session_category_id'];
             $session['title'] = $session_info['name'];
-            $session['id_coach'] = $session_info['id_coach'];
+            $session['coach_id'] = $session['id_coach'] = $session_info['id_coach'];
             $session['dates'] = '';
             $session['coach'] = '';
             if (api_get_setting('show_session_coach') === 'true' && isset($coachInfo['complete_name'])) {
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index aed17cfe09..2d9ac9d660 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -78,6 +78,7 @@ class MessageManager
                     user_receiver_id = ".api_get_user_id()."
                     $keywordCondition
                 ";
+
         $result = Database::query($sql);
         $result = Database::fetch_array($result);
 
@@ -847,15 +848,11 @@ class MessageManager
      */
     public static function delete_message_by_user_sender($user_sender_id, $id)
     {
-        if ($id != strval(intval($id))) {
-            return false;
-        }
+        $user_sender_id = (int) $user_sender_id;
+        $id = (int) $id;
 
         $table = Database::get_main_table(TABLE_MESSAGE);
 
-        $id = intval($id);
-        $user_sender_id = intval($user_sender_id);
-
         $sql = "SELECT * FROM $table WHERE id='$id'";
         $rs = Database::query($sql);
 
@@ -865,7 +862,7 @@ class MessageManager
             // delete message
             $sql = "UPDATE $table
                     SET msg_status = ".MESSAGE_STATUS_DELETED."
-                    WHERE user_sender_id='$user_sender_id' AND id='$id'";
+                    WHERE user_sender_id= $user_sender_id AND id= $id";
             Database::query($sql);
 
             return true;
diff --git a/main/inc/lib/sortable_table.class.php b/main/inc/lib/sortable_table.class.php
index f1b85a3dd9..29f4d09480 100755
--- a/main/inc/lib/sortable_table.class.php
+++ b/main/inc/lib/sortable_table.class.php
@@ -707,7 +707,7 @@ class SortableTable extends HTML_Table
         foreach ($param as $key => &$value) {
             $result[] = '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
         }
-        $result[] = '<select name="'.$this->param_prefix.'per_page" onchange="javascript: this.form.submit();">';
+        $result[] = '<select style="width: auto;" class="form-control" name="'.$this->param_prefix.'per_page" onchange="javascript: this.form.submit();">';
         $list = [10, 20, 50, 100, 500, 1000];
 
         $rowList = api_get_configuration_value('table_row_list');
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index 6d2f60bb7d..140d117f52 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -94,16 +94,16 @@ if ($action == 'delete') {
             $delete_list_id[$i]
         );
     }
-    $delete_list_id = [];
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    MessageManager::outbox_display($keyword);
+    header("Location: ".api_get_self());
+    exit;
 } elseif ($action == 'deleteone') {
-    $delete_list_id = [];
-    $id = Security::remove_XSS($_GET['id']);
-    MessageManager::delete_message_by_user_sender(api_get_user_id(), $id);
-    $delete_list_id = [];
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    MessageManager::delete_message_by_user_sender(api_get_user_id(), $_GET['id']);
+    MessageManager::outbox_display($keyword);
+    header("Location: ".api_get_self());
+    exit;
 } else {
-    $social_right_content .= MessageManager::outbox_display($keyword);
+    $social_right_content = MessageManager::outbox_display($keyword);
 }
 
 $tpl = new Template(get_lang('Outbox'));