Fix redirect after deleting a message

pull/2981/head
Julio Montoya 6 years ago
parent 9f63e4895a
commit 319bf79c87
  1. 2
      main/inc/lib/display.lib.php
  2. 11
      main/inc/lib/message.lib.php
  3. 2
      main/inc/lib/sortable_table.class.php
  4. 16
      main/messages/outbox.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'])) {

@ -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;

@ -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');

@ -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'));

Loading…
Cancel
Save