Fix redirect, remove unused code see BT#15983

main/inc/lib/message.lib.php

@@ -907,6 +907,7 @@ class MessageManager
                     SET msg_status = '".MESSAGE_STATUS_DELETED."'
                     WHERE user_sender_id= $user_sender_id AND id= $id";
             Database::query($sql);
+
             return true;
         }
 
@@ -1347,6 +1348,10 @@ class MessageManager
                 break;
         }
 
+        if (empty($userCondition)) {
+            return '';
+        }
+
         $query = "SELECT * FROM $table
                   WHERE                            
                     id = $messageId AND 
@@ -2259,6 +2264,8 @@ class MessageManager
                     }
                     break;
             }
+            header('Location: '.api_get_self());
+            exit;
         }
 
         $actions = ['reply', 'mark_as_unread', 'mark_as_read', 'forward', 'delete'];
@@ -2299,6 +2306,9 @@ class MessageManager
                     ));
                     break;
             }
+
+            header('Location: '.api_get_self());
+            exit;
         }
 
         $html = self::getMessageGrid(self::MESSAGE_TYPE_PROMOTED, $keyword, $actions);
@@ -2328,6 +2338,7 @@ class MessageManager
                         'normal',
                         false
                     ));
+
                     break;
                 case 'deleteone':
                     self::delete_message_by_user_sender($currentUserId, $_GET['id']);
@@ -2338,6 +2349,9 @@ class MessageManager
                     ));
                     break;
             }
+
+            header('Location: '.api_get_self());
+            exit;
         }
 
         $html = self::getMessageGrid(self::MESSAGE_TYPE_OUTBOX, $keyword, $actions);

main/inc/lib/sortable_table.class.php

@@ -1012,6 +1012,7 @@ class SortableTable extends HTML_Table
                 $this->getDataFunctionParams()
             );
         }
+
         return $this->total_number_of_items;
     }
 

main/messages/view_message.php

@@ -21,7 +21,6 @@ if (empty($messageId)) {
     api_not_allowed(true);
 }
 
-
 if ($allowSocial) {
     $this_section = SECTION_SOCIAL;
     $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'main/social/home.php', 'name' => get_lang('SocialNetwork')];
@@ -32,7 +31,7 @@ if ($allowSocial) {
 $interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')];
 
 $social_right_content = '<div class="actions">';
-if ($allowMessage === 'true') {
+if ($allowMessage) {
     $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
         Display::return_icon('new-message.png', get_lang('ComposeMessage')).'</a>';
     $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.

main/social/promoted_messages.php

@@ -17,31 +17,6 @@ $logInfo = [
 ];
 Event::registerLog($logInfo);
 
-$nameTools = get_lang('Messages');
-$show_message = null;
-if (isset($_GET['form_reply']) || isset($_GET['form_delete'])) {
-    $info_reply = [];
-    $info_delete = [];
-    if (isset($_GET['form_delete'])) {
-        //allow to delete messages
-        $info_delete = explode(',', $_GET['form_delete']);
-        $count_delete = (count($info_delete) - 1);
-    }
-
-    if (trim($info_delete[0]) === 'delete') {
-        for ($i = 1; $i <= $count_delete; $i++) {
-            MessageManager::delete_message_by_user_receiver(
-                api_get_user_id(),
-                $info_delete[$i]
-            );
-        }
-        $message_box = get_lang('SelectedMessagesDeleted');
-        $show_message .= Display::return_message(api_xml_http_response_encode($message_box));
-        $social_right_content .= MessageManager::inboxDisplay();
-        exit;
-    }
-}
-
 $this_section = SECTION_SOCIAL;
 $interbreadcrumb[] = [
     'url' => api_get_path(WEB_CODE_PATH).'social/home.php',
@@ -68,22 +43,7 @@ if ($form->validate()) {
 }
 $actionsRight = $form->returnForm();
 $social_right_content .= Display::toolbarAction('toolbar', [$actionsLeft, $actionsRight]);
-
-if (!isset($_GET['del_msg'])) {
-    $social_right_content .= MessageManager::getPromotedMessagesGrid($keyword);
-} else {
-    $num_msg = (int) $_POST['total'];
-    for ($i = 0; $i < $num_msg; $i++) {
-        if ($_POST[$i]) {
-            // The user_id was necessary to delete a message??
-            $show_message .= MessageManager::delete_message_by_user_receiver(
-                api_get_user_id(),
-                $_POST['_'.$i]
-            );
-        }
-    }
-    $social_right_content .= MessageManager::getPromotedMessagesGrid();
-}
+$social_right_content .= MessageManager::getPromotedMessagesGrid($keyword);
 
 $tpl = new Template(null);
 // Block Social Avatar

main/social/view_promoted_message.php

@@ -4,6 +4,7 @@
 /**
  * @package chamilo.messages
  */
+
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 api_block_anonymous_users();
@@ -17,26 +18,17 @@ $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'main/social/home.php', 'n
 $interbreadcrumb[] = ['url' => 'promoted_messages.php', 'name' => get_lang('PromotedMessages')];
 
 $social_right_content = '';
-if (empty($_GET['id'])) {
-    $messageId = $_GET['id_send'];
-    $source = 'outbox';
-    $show_menu = 'messages_outbox';
-} else {
-    $messageId = $_GET['id'];
-    $source = 'inbox';
-    $show_menu = 'messages_inbox';
-}
+$messageId = $_GET['id'];
 
 $message = '';
-
 $logInfo = [
     'tool' => 'Messages',
-    'action' => $source,
+    'action' => 'promoted_messages',
     'action_details' => 'view-message',
 ];
 Event::registerLog($logInfo);
-$social_menu_block = SocialManager::show_social_menu($show_menu);
-$message .= MessageManager::showMessageBox($messageId, 'promoted_messages');
+$social_menu_block = SocialManager::show_social_menu('inbox');
+$message .= MessageManager::showMessageBox($messageId, MessageManager::MESSAGE_TYPE_PROMOTED);
 
 if (!empty($message)) {
     $social_right_content .= $message;
@@ -45,7 +37,7 @@ if (!empty($message)) {
 }
 $tpl = new Template(get_lang('View'));
 // Block Social Avatar
-SocialManager::setSocialUserBlock($tpl, api_get_user_id(), $show_menu);
+SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'promoted_messages');
 
 $tpl->assign('social_menu_block', $social_menu_block);
 $tpl->assign('social_right_content', $social_right_content);