From 6961c48ecb17c75b9ae4f144796c24d7397db4a8 Mon Sep 17 00:00:00 2001
From: carlos alvarado <alvaradocarlo@gmail.com>
Date: Wed, 24 Jun 2020 11:03:59 -0500
Subject: [PATCH 1/3]  Wrong  file list order on last_sent  column in Dropbox
 3162

Add last edit date at start to sort correctly by date
---
 main/document/document.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index 2d88ceddc5..520e2c91da 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1913,17 +1913,21 @@ if (!empty($documentAndFolders)) {
                 $displaySize = format_file_size($document_data['size']);
             }
 
-            $row[] = '<span style="display:none;">'.$size.'</span>'.
-                $invisibility_span_open.
-                $displaySize.
+            $row[] = '<span style="display:none;">' . $size . '</span>' .
+                $invisibility_span_open .
+                $displaySize .
                 $invisibility_span_close;
 
             // Last edit date
             $last_edit_date = api_get_local_time($document_data['lastedit_date']);
-            $display_date = date_to_str_ago($document_data['lastedit_date']).
-                ' <div class="muted"><small>'.$last_edit_date."</small></div>";
+            $display_date = date_to_str_ago($document_data['lastedit_date']) .
+                ' <div class="muted"><small>' . $last_edit_date . "</small></div>";
 
-            $row[] = $invisibility_span_open.$display_date.$invisibility_span_close;
+            /* add last edit date at begin to short by date*/
+            $row[] = "<span style='display: none;'>" . $last_edit_date . "</span>" .
+                $invisibility_span_open .
+                $display_date .
+                $invisibility_span_close;
 
             $groupMemberWithEditRightsCheckDocument = GroupManager::allowUploadEditDocument(
                 $userId,
@@ -2060,12 +2064,13 @@ $column_show[] = 0;
 
 $column_order = [];
 
-if (count($row) == 12) {
-    //teacher
-    $column_order[2] = 8; //name
-    $column_order[3] = 7;
-    $column_order[4] = 6;
-} elseif (count($row) == 10) {
+if (count($row) == 12)
+    {
+        //teacher
+        $column_order[2] = 8; //name
+        $column_order[3] = 7; //size
+        $column_order[4] = 6; //lastedit_date
+    } elseif (count($row) == 10) {
     //student
     $column_order[1] = 6;
     $column_order[2] = 5;
@@ -2149,7 +2154,6 @@ echo $templateForm;
 echo $moveForm;
 echo $dirForm;
 echo $selector;
-
 $table->display();
 
 if (count($documentAndFolders) > 1) {

From c6e4703d313dab864ee3e9cffa08bb03ebf46ecb Mon Sep 17 00:00:00 2001
From: carlos alvarado <alvaradocarlo@gmail.com>
Date: Wed, 24 Jun 2020 18:07:29 +0200
Subject: [PATCH 2/3] Applied fixes from FlintCI

---
 main/document/document.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index 520e2c91da..f193d48b0a 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1913,20 +1913,20 @@ if (!empty($documentAndFolders)) {
                 $displaySize = format_file_size($document_data['size']);
             }
 
-            $row[] = '<span style="display:none;">' . $size . '</span>' .
-                $invisibility_span_open .
-                $displaySize .
+            $row[] = '<span style="display:none;">'.$size.'</span>'.
+                $invisibility_span_open.
+                $displaySize.
                 $invisibility_span_close;
 
             // Last edit date
             $last_edit_date = api_get_local_time($document_data['lastedit_date']);
-            $display_date = date_to_str_ago($document_data['lastedit_date']) .
-                ' <div class="muted"><small>' . $last_edit_date . "</small></div>";
+            $display_date = date_to_str_ago($document_data['lastedit_date']).
+                ' <div class="muted"><small>'.$last_edit_date."</small></div>";
 
             /* add last edit date at begin to short by date*/
-            $row[] = "<span style='display: none;'>" . $last_edit_date . "</span>" .
-                $invisibility_span_open .
-                $display_date .
+            $row[] = "<span style='display: none;'>".$last_edit_date."</span>".
+                $invisibility_span_open.
+                $display_date.
                 $invisibility_span_close;
 
             $groupMemberWithEditRightsCheckDocument = GroupManager::allowUploadEditDocument(
@@ -2064,13 +2064,12 @@ $column_show[] = 0;
 
 $column_order = [];
 
-if (count($row) == 12)
-    {
-        //teacher
+if (count($row) == 12) {
+    //teacher
         $column_order[2] = 8; //name
         $column_order[3] = 7; //size
         $column_order[4] = 6; //lastedit_date
-    } elseif (count($row) == 10) {
+} elseif (count($row) == 10) {
     //student
     $column_order[1] = 6;
     $column_order[2] = 5;

From f126bb23be7b092d19a88e555308d16d6156c0e5 Mon Sep 17 00:00:00 2001
From: carlos alvarado <alvaradocarlo@gmail.com>
Date: Mon, 29 Jun 2020 13:10:26 -0500
Subject: [PATCH 3/3] Wrong file list order on last_sent column in Dropbox 3162

Add last edit date at start to sort correctly by date

Fix tab to 4 spaces
---
 main/document/document.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index f193d48b0a..082b6362f8 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -2066,9 +2066,9 @@ $column_order = [];
 
 if (count($row) == 12) {
     //teacher
-        $column_order[2] = 8; //name
-        $column_order[3] = 7; //size
-        $column_order[4] = 6; //lastedit_date
+    $column_order[2] = 8; //name
+    $column_order[3] = 7; //size
+    $column_order[4] = 6; //lastedit_date
 } elseif (count($row) == 10) {
     //student
     $column_order[1] = 6;