From 37d2f191c76c99be9e7a23a6b274526280f569a9 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Wed, 23 Aug 2017 11:37:56 +0200
Subject: [PATCH] Sort plugin status on ranking

---
 plugins/dynamix.plugin.manager/Plugins.page       |  7 ++++++-
 plugins/dynamix.plugin.manager/Update.page        |  7 ++++++-
 .../include/ShowPlugins.php                       | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page
index c7461c507..9f0e15c97 100644
--- a/plugins/dynamix.plugin.manager/Plugins.page
+++ b/plugins/dynamix.plugin.manager/Plugins.page
@@ -58,7 +58,12 @@ $(function() {
     resize();
     $(window).bind('resize',function(){resize(true);});
 <?endif;?>
-    $('#plugin_table').tablesorter({sortList:[[4,0],[1,0]],sortAppend:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}}});
+    $('#plugin_table').tablesorter({
+      sortList:[[4,0],[1,0]],
+      sortAppend:[[1,0]],
+      headers:{0:{sorter:false},5:{sorter:false}},
+      textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}
+    });
     $('.desc_readmore').readmore({maxHeight:58});
   });
   $('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);});
diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page
index e88cac842..69b705e6c 100644
--- a/plugins/dynamix.plugin.manager/Update.page
+++ b/plugins/dynamix.plugin.manager/Update.page
@@ -41,7 +41,12 @@ function update_table(branch) {
 $(function() {
   $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{system:'true',audit:<?=$audit?>},function(data) {
     if (data) $('#os_list').html(data);
-    $('#os_table').tablesorter({sortList:[[1,0]],headers:{0:{sorter:false},5:{sorter:false}}});
+    $('#os_table').tablesorter({
+      sortList:[[4,0],[1,0]],
+      sortAppend:[[1,0]],
+      headers:{0:{sorter:false},5:{sorter:false}},
+      textExtraction:function(n,t,i){return $(n).attr('data')||$(n).text();}
+    });
 <?if (preg_match("/^\*\*REBOOT REQUIRED\!\*\*/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md"))):?>
     $('#change_branch').prop('disabled',true);
 <?endif;?>
diff --git a/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/plugins/dynamix.plugin.manager/include/ShowPlugins.php
index 291474ac8..acab07f24 100644
--- a/plugins/dynamix.plugin.manager/include/ShowPlugins.php
+++ b/plugins/dynamix.plugin.manager/include/ShowPlugins.php
@@ -92,6 +92,11 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
       }
     }
   }
+  if (strpos($status,'update')!==false) $rank = '0';
+  elseif (strpos($status,'install')!==false) $rank = '1';
+  elseif ($status=='need check') $rank = '2';
+  elseif ($status=='up-to-date') $rank = '3';
+  else $rank = '4';
   $changes = plugin('changes',$changes_file);
   if ($changes !== false) {
     $txtfile = "/tmp/plugins/".basename($plugin_file,'.plg').".txt";
@@ -101,11 +106,11 @@ foreach (glob("/var/log/plugins/*.plg",GLOB_NOSORT) as $plugin_link) {
 //write plugin information
   $empty = false;
   echo "<tr>";
-  echo "<td style='vertical-align:top;width:64px'><p style='text-align:center'>{$link}</p></td>";
-  echo "<td><span class='desc_readmore' style='display:block'>{$desc}</span></td>";
-  echo "<td>{$author}</td>";
-  echo "<td>{$version}</td>";
-  echo "<td>{$status}</td>";
+  echo "<td style='vertical-align:top;width:64px'><p style='text-align:center'>$link</p></td>";
+  echo "<td><span class='desc_readmore' style='display:block'>$desc</span></td>";
+  echo "<td>$author</td>";
+  echo "<td>$version</td>";
+  echo "<td data='$rank'>$status</td>";
   echo "<td>";
   if ($system) {
     if ($os) {